chore: rename function to grammarScopeToAutoCompleteSelector

Author: aminya

lib/adapters/autocomplete-adapter.ts

@@ -558,3 +558,13 @@ export default class AutocompleteAdapter {
     }
   }
 }
+
+/**
+ * Normalizes the given grammar scope for autoComplete package so it always starts with `.`
+ * Based on https://github.com/atom/autocomplete-plus/wiki/Autocomplete-Providers
+ * @param grammarScope such as 'source.python' or '.source.python'
+ * @returns the normalized grammarScope such as `.source.python`
+ */
+export function grammarScopeToAutoCompleteSelector(grammarScope: string): string {
+  return grammarScope.includes(".") && grammarScope[0] !== "." ? `.${grammarScope}` : grammarScope
+}

lib/auto-languageclient.ts

@@ -7,7 +7,7 @@ import * as atomIde from "atom-ide"
 import * as linter from "atom/linter"
 import Convert from "./convert.js"
 import ApplyEditAdapter from "./adapters/apply-edit-adapter"
-import AutocompleteAdapter from "./adapters/autocomplete-adapter"
+import AutocompleteAdapter, { grammarScopeToAutoCompleteSelector } from "./adapters/autocomplete-adapter"
 import CodeActionAdapter from "./adapters/code-action-adapter"
 import CodeFormatAdapter from "./adapters/code-format-adapter"
 import CodeHighlightAdapter from "./adapters/code-highlight-adapter"
@@ -547,10 +547,10 @@ export default class AutoLanguageClient {
   public provideAutocomplete(): ac.AutocompleteProvider {
     return {
       selector: this.getGrammarScopes()
-        .map((g) => Utils.normalizeGrammarScope(g))
+        .map((g) => grammarScopeToAutoCompleteSelector(g))
         .join(", "),
       disableForSelector: this.getAutocompleteDisabledScopes()
-        .map((g) => Utils.normalizeGrammarScope(g))
+        .map((g) => grammarScopeToAutoCompleteSelector(g))
         .join(", "),
       inclusionPriority: 1,
       suggestionPriority: 2,

lib/utils.ts

@@ -123,12 +123,3 @@ export function getExePath(exeName: string, rootPath = rootPathDefault, exeExten
     return exeName
   }
 }
-
-/**
- * Normalizes the given grammar scope so it always starts with `.`
- * @param grammarScope such as 'source.python' or '.source.python'
- * @returns the normalized grammarScope such as `.source.python`
- */
-export function normalizeGrammarScope(grammarScope: string): string {
-  return grammarScope.includes(".") && grammarScope[0] !== "." ? `.${grammarScope}` : grammarScope
-}

test/adapters/autocomplete-adapter.test.ts

@@ -1,4 +1,4 @@
-import AutoCompleteAdapter from "../../lib/adapters/autocomplete-adapter"
+import AutoCompleteAdapter, { grammarScopeToAutoCompleteSelector } from "../../lib/adapters/autocomplete-adapter"
 import { ActiveServer } from "../../lib/server-manager.js"
 import * as ls from "../../lib/languageclient"
 import * as sinon from "sinon"
@@ -807,4 +807,16 @@ describe("AutoCompleteAdapter", () => {
       expect(result).equals("value")
     })
   })
+
+  describe("grammarScopeToAutoCompleteSelector", () => {
+    it("prepends dot to the begining of the grammarScope", () => {
+      expect(grammarScopeToAutoCompleteSelector("source.python")).equal(".source.python")
+    })
+    it("doesn't prepend dot if it already has", () => {
+      expect(grammarScopeToAutoCompleteSelector(".source.python")).equal(".source.python")
+    })
+    it("doesn't prepend dot if the scope doesn't have dot in it", () => {
+      expect(grammarScopeToAutoCompleteSelector("javascript")).equal("javascript")
+    })
+  })
 })

test/utils.test.ts

@@ -81,16 +81,4 @@ describe("Utils", () => {
       expect(exePath).eq("python")
     })
   })
-
-  describe("normalizeGrammarScope", () => {
-    it("prepends dot to the begining of the grammarScope", () => {
-      expect(Utils.normalizeGrammarScope("source.python")).equal(".source.python")
-    })
-    it("doesn't prepend dot if it already has", () => {
-      expect(Utils.normalizeGrammarScope(".source.python")).equal(".source.python")
-    })
-    it("doesn't prepend dot if the scope doesn't have dot in it", () => {
-      expect(Utils.normalizeGrammarScope("javascript")).equal("javascript")
-    })
-  })
 })