Fix linting and tests

elm-tooling · May 28, 2020 · 57bca03 · 57bca03
1 parent 209d04e
commit 57bca03
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -1 +1,2 @@
-trailingComma: "all"
+trailingComma: "all"
+endOfLine: "auto"
diff --git a/src/providers/completionProvider.ts b/src/providers/completionProvider.ts
@@ -403,7 +403,7 @@ export class CompletionProvider {
   private getSameFileTopLevelCompletions(
     tree: Tree,
     range: Range,
-    moduleDefinition: boolean = false,
+    moduleDefinition = false,
   ): CompletionItem[] {
     const completions: CompletionItem[] = [];
     const topLevelFunctions = TreeUtils.findAllTopLeverFunctionDeclarations(
@@ -872,7 +872,7 @@ export class CompletionProvider {
             documentation,
             possibleImport.value,
             range,
-            "e" + i,
+            `e${i}`,
             detail,
             importTextEdit,
           ),
@@ -883,7 +883,7 @@ export class CompletionProvider {
             documentation,
             possibleImport.value,
             range,
-            "e" + i,
+            `e${i}`,
             detail,
             importTextEdit,
           ),
@@ -894,7 +894,7 @@ export class CompletionProvider {
             documentation,
             possibleImport.value,
             range,
-            "e" + i,
+            `e${i}`,
             detail,
             importTextEdit,
           ),

diff --git a/src/test/completionProvider.test.ts b/src/test/completionProvider.test.ts
@@ -61,16 +61,22 @@ describe("CompletionProvider", () => {
           treeParser.getWorkspace(newSources),
         ) ?? [];
 
+      const completionsList = Array.isArray(completions)
+        ? completions
+        : completions.items;
+
       if (testExactCompletions) {
-        expect(completions.length).toBe(expectedCompletions.length);
+        expect(completionsList.length).toBe(expectedCompletions.length);
       } else {
-        expect(completions.length).toBeGreaterThanOrEqual(
+        expect(completionsList.length).toBeGreaterThanOrEqual(
           expectedCompletions.length,
         );
       }
 
       expectedCompletions.forEach((completion) => {
-        expect(completions.find((c) => c.label === completion)).toBeTruthy();
+        expect(
+          completionsList.find((c) => c.label === completion),
+        ).toBeTruthy();
       });
     }
 

diff --git a/src/util/importUtils.ts b/src/util/importUtils.ts
@@ -3,7 +3,7 @@ import RANKING_LIST from "../providers/ranking";
 import { TreeUtils, NodeType } from "./treeUtils";
 import { SyntaxNode } from "web-tree-sitter";
 
-interface PossibleImport {
+interface IPossibleImport {
   module: string;
   value: string;
   type: NodeType;
@@ -17,7 +17,7 @@ export class ImportUtils {
     forest: IForest,
     uri: string,
     filterText: string,
-  ): PossibleImport[] {
+  ): IPossibleImport[] {
     const currentTree = forest.getTree(uri);
 
     if (currentTree) {
@@ -52,8 +52,9 @@ export class ImportUtils {
           } else if (!aStartsWith && bStartsWith) {
             return 1;
           } else {
-            const aMatches = aValue.match(filterText);
-            const bMatches = bValue.match(filterText);
+            const regex = new RegExp(filterText);
+            const aMatches = regex.exec(aValue);
+            const bMatches = regex.exec(bValue);
 
             if (aMatches && !bMatches) {
               return -1;
@@ -72,10 +73,10 @@ export class ImportUtils {
   public static getPossibleImports(
     forest: IForest,
     uri: string,
-  ): PossibleImport[] {
+  ): IPossibleImport[] {
     const currentModule = forest.getByUri(uri)?.moduleName;
 
-    const exposedValues: PossibleImport[] = [];
+    const exposedValues: IPossibleImport[] = [];
 
     // Find all exposed values that could be imported
     if (forest) {