Merge pull request #445 from codefori/fix/completion_in_blocks

Improvements to completion provider with subitems

Author: worksofliam

extension/server/src/providers/completionItem.ts

@@ -8,6 +8,7 @@ import skipRules from './linter/skipRules';
 import * as Project from "./project";
 import { getInterfaces } from './project/exportInterfaces';
 import Parser from '../../../../language/parser';
+import { Token } from '../../../../language/types';
 
 const completionKind = {
 	function: CompletionItemKind.Interface,
@@ -46,17 +47,19 @@ export default async function completionItemProvider(handler: CompletionParams):
 
 			// This means we're just looking for subfields in the struct
 			if (trigger === `.`) {
-				const tokens = Parser.lineTokens(isFree ? currentLine : currentLine.length >= 7 ? currentLine.substring(7) : ``, 0, 0, true);
+				const cursorIndex = handler.position.character;
+				let tokens = Parser.lineTokens(isFree ? currentLine : currentLine.length >= 7 ? ``.padEnd(7) + currentLine.substring(7) : ``, 0, 0, true);
 
 				if (tokens.length > 0) {
-					const cursorIndex = handler.position.character;
-					let tokenIndex = tokens.findIndex(token => cursorIndex > token.range.start && cursorIndex <= token.range.end);
-					console.log(tokens);
-					console.log({ cPos: handler.position.character, tokenIndex });
+					
+					// We need to find the innermost block we are part of
+					tokens = Parser.fromBlocksGetTokens(tokens, cursorIndex);
 
-					while (tokens[tokenIndex] && [`block`, `word`, `dot`].includes(tokens[tokenIndex].type) && tokenIndex > 0) {
-						tokenIndex--;
-					}
+					// Remove any tokens after the cursor
+					tokens = tokens.filter(token => token.range.end <= cursorIndex);
+
+					// Get the possible variable we're referring to
+					let tokenIndex = Parser.getReference(tokens, cursorIndex);
 
 					let currentDef: Declaration | undefined;
 

language/parser.ts

@@ -159,6 +159,28 @@ export default class Parser {
     return tokens;
   }
 
+  static fromBlocksGetTokens(tokensWithBlocks: Token[], cursorIndex: number) {
+    let insideBlock: Token | undefined;
+
+    while (insideBlock = tokensWithBlocks.find(t => t.type === `block` && t.block && t.range.start <= cursorIndex && t.range.end >= cursorIndex)) {
+      tokensWithBlocks = insideBlock.block || [];
+    }
+
+    return tokensWithBlocks;
+  }
+
+  static getReference(tokens: Token[], cursorIndex: number): number|-1 {
+    let tokenIndex = tokens.findIndex(token => cursorIndex > token.range.start && cursorIndex <= token.range.end);
+
+    let lastToken: Token|undefined;
+    while (tokens[tokenIndex] && [`block`, `word`, `dot`].includes(tokens[tokenIndex].type) && lastToken?.type !== tokens[tokenIndex].type && tokenIndex > 0) {
+      lastToken = tokens[tokenIndex];
+      tokenIndex--;
+    }
+
+    return tokenIndex;
+  }
+
   async getDocs(workingUri: string, baseContent?: string, options: ParseOptions = {withIncludes: true, collectReferences: true}): Promise<Cache|undefined> {
     const existingCache = this.getParsedCache(workingUri);
     if (options.ignoreCache !== true && existingCache) {

language/tokens.ts

@@ -472,7 +472,7 @@ export function createBlocks(tokens: Token[]) {
           block: createBlocks(newTokens),
           range: {
             line: tokens[start].range.line,
-            start: tokens[i].range.start,
+            start: tokens[start].range.start,
             end: tokens[i].range.end,
           }
         });