Merge pull request #136 from atom-community/auto-languageclient-features

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"
@@ -158,6 +158,22 @@ export default class AutoLanguageClient {
             completionItem: {
               snippetSupport: true,
               commitCharactersSupport: false,
+              documentationFormat: [],
+              deprecatedSupport: false,
+              preselectSupport: false,
+              tagSupport: {
+                valueSet: [],
+              },
+              insertReplaceSupport: false,
+              resolveSupport: {
+                properties: [],
+              },
+              insertTextModeSupport: {
+                valueSet: [],
+              },
+            },
+            completionItemKind: {
+              valueSet: [],
             },
             contextSupport: true,
           },
@@ -548,14 +564,29 @@ export default class AutoLanguageClient {
   }
 
   // Autocomplete+ via LS completion---------------------------------------
+
+  /**
+   * A method to override to return an array of grammar scopes that should not be used for autocompletion.
+   *
+   * Usually that's used for disabling autocomplete inside comments,
+   * @example if the grammar scopes are [ '.source.js' ], `getAutocompleteDisabledScopes` may return [ '.source.js .comment' ].
+   */
+  protected getAutocompleteDisabledScopes(): Array<string> {
+    return []
+  }
+
   public provideAutocomplete(): ac.AutocompleteProvider {
     return {
       selector: this.getGrammarScopes()
-        .map((g) => (g.includes(".") ? "." + g : g))
+        .map((g) => grammarScopeToAutoCompleteSelector(g))
+        .join(", "),
+      disableForSelector: this.getAutocompleteDisabledScopes()
+        .map((g) => grammarScopeToAutoCompleteSelector(g))
         .join(", "),
       inclusionPriority: 1,
       suggestionPriority: 2,
       excludeLowerPriority: false,
+      filterSuggestions: true,
       getSuggestions: this.getSuggestions.bind(this),
       onDidInsertSuggestion: this.onDidInsertSuggestion.bind(this),
       getSuggestionDetailsOnSelect: this.getSuggestionDetailsOnSelect.bind(this),

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")
+    })
+  })
 })