Fix to content dot content assist

Signed-off-by: Liam Barry Allan <mrliamallan@live.co.uk>

Author: worksofliam

server/src/providers/completionItem.ts

@@ -30,7 +30,7 @@ export default async function completionItemProvider(handler: CompletionParams):
 
 			// This means we're just looking for subfields in the struct
 			if (trigger === `.`) {
-				let currentPosition = Position.create(handler.position.line, handler.position.character - 1);
+				let currentPosition = Position.create(handler.position.line, handler.position.character - 2);
 				let preWord = getWordRangeAtPosition(document, currentPosition);
 
 				// Uh oh! Maybe we found dim struct?
@@ -49,15 +49,15 @@ export default async function completionItemProvider(handler: CompletionParams):
 					if (currentProcedure && currentProcedure.scope) {
 						const procScop = currentProcedure.scope;
 
-						possibleStruct = currentProcedure.subItems.find(subitem => subitem.name.toUpperCase() === word && subitem.subItems.length > 0);
+						possibleStruct = currentProcedure.subItems.find(subitem => subitem.name.toUpperCase() === preWord && subitem.subItems.length > 0);
 
 						if (!possibleStruct) {
-							possibleStruct = procScop.structs.find(struct => struct.name.toUpperCase() === word);
+							possibleStruct = procScop.structs.find(struct => struct.name.toUpperCase() === preWord);
 						}
 					}
 
 					if (!possibleStruct) {
-						possibleStruct = doc.structs.find(struct => struct.name.toUpperCase() === word);
+						possibleStruct = doc.structs.find(struct => struct.name.toUpperCase() === preWord);
 					}
 
 					if (possibleStruct && possibleStruct.keyword[`QUALIFIED`]) {

server/src/providers/index.ts

@@ -39,5 +39,5 @@ export function getWordRangeAtPosition(document: TextDocument, position: Positio
 	if (startChar === endChar)
 		return undefined;
 	else
-		return document.getText(Range.create(line, Math.max(0, startChar), line, endChar+1));
+		return document.getText(Range.create(line, Math.max(0, startChar), line, endChar+1)).replace(/(\r\n|\n|\r)/gm, "");
 }