Fixes CompletionItemKinds for typed variables (#1145)

* Fixes CompletionItemKinds for typed variables

* removed comment

* No replaceAll() on github test runner

Author: markwpearce

src/bscPlugin/completions/CompletionsProcessor.spec.ts

@@ -1898,6 +1898,86 @@ describe('CompletionsProcessor', () => {
 
     });
 
+    describe('typed variables', () => {
+        it('shows variables of type interface as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeInterface)
+                    print thi|
+                end sub
+
+                interface SomeInterface
+                    optional name as string
+                    optional data
+                    optional function doStuff()
+                end interface
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('shows variables of type class as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeKlass)
+                    print thi|
+                end sub
+
+                class SomeKlass
+                    name as string
+                    data
+                    function doStuff()
+                    end function
+                end class
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('shows variables of type enum as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeEnum)
+                    print thi|
+                end sub
+
+                enum SomeEnum
+                    up
+                    down
+                end end
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('shows variables of type function as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as function)
+                    print thi|
+                end sub
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+    });
 
     describe('brighterscript vs brightscript', () => {
         it('should not include transpiled versions of symbols in brighterscript code', () => {

src/bscPlugin/completions/CompletionsProcessor.ts

@@ -1,4 +1,4 @@
-import { isBlock, isBrsFile, isCallableType, isClassStatement, isClassType, isComponentType, isConstStatement, isEnumMemberType, isEnumType, isFunctionExpression, isInterfaceType, isMethodStatement, isNamespaceStatement, isNamespaceType, isNativeType, isXmlFile, isXmlScope } from '../../astUtils/reflection';
+import { isBlock, isBrsFile, isCallableType, isClassStatement, isClassType, isComponentType, isConstStatement, isEnumMemberType, isEnumType, isFunctionExpression, isInterfaceType, isMethodStatement, isNamespaceStatement, isNamespaceType, isNativeType, isTypedFunctionType, isXmlFile, isXmlScope } from '../../astUtils/reflection';
 import type { FileReference, ProvideCompletionsEvent } from '../../interfaces';
 import type { BscFile } from '../../files/BscFile';
 import { AllowedTriviaTokens, DeclarableTypes, Keywords, TokenKind } from '../../lexer/TokenKind';
@@ -371,21 +371,31 @@ export class CompletionsProcessor {
     private getCompletionKindFromSymbol(symbol: BscSymbol, areMembers = false) {
         const type = symbol?.type;
         const extraData = symbol?.data;
+        const finalTypeNameLower = type?.toString().split('.').pop().toLowerCase();
+        const symbolNameLower = symbol?.name.toLowerCase();
+        let nameMatchesType = symbolNameLower === finalTypeNameLower;
         if (isConstStatement(extraData?.definingNode)) {
             return CompletionItemKind.Constant;
-        } else if (isClassType(type)) {
+        } else if (isClassType(type) && nameMatchesType) {
             return CompletionItemKind.Class;
         } else if (isCallableType(type)) {
-            return areMembers ? CompletionItemKind.Method : CompletionItemKind.Function;
-        } else if (isInterfaceType(type)) {
+            if (isTypedFunctionType(type) && !nameMatchesType) {
+                if (symbolNameLower === type.name.replace(/\./gi, '_').toLowerCase()) {
+                    nameMatchesType = true;
+                }
+            }
+            if (nameMatchesType) {
+                return areMembers ? CompletionItemKind.Method : CompletionItemKind.Function;
+            }
+        } else if (isInterfaceType(type) && nameMatchesType) {
             return CompletionItemKind.Interface;
-        } else if (isEnumType(type)) {
+        } else if (isEnumType(type) && nameMatchesType) {
             return CompletionItemKind.Enum;
         } else if (isEnumMemberType(type)) {
             return CompletionItemKind.EnumMember;
         } else if (isNamespaceType(type)) {
             return CompletionItemKind.Module;
-        } else if (isComponentType(type)) {
+        } else if (isComponentType(type) && (nameMatchesType || symbolNameLower === 'rosgnode')) {
             return CompletionItemKind.Interface;
         }
         if (areMembers) {

src/parser/Statement.ts

@@ -434,7 +434,7 @@ export class FunctionStatement extends Statement implements TypedefProvider {
 
     getType(options: GetTypeOptions) {
         const funcExprType = this.func.getType(options);
-        funcExprType.setName(this.tokens.name?.text);
+        funcExprType.setName(this.getName(ParseMode.BrighterScript));
         return funcExprType;
     }
 }