Allow tab-invoked completion in strings, suppress autoinvoke in def

Author: krassowski

packages/jupyterlab-lsp/schema/completion.json

@@ -17,14 +17,23 @@
       "default": false,
       "description": "Whether to enable continuous hinting (Hinterland mode)."
     },
-    "suppressInvokeIn": {
-      "title": "Suppress invoke in specific code fragments",
+    "suppressContinuousHintingIn": {
+      "title": "Suppress invoke continuous hinting in specific code fragments",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": ["comment", "string", "def"],
+      "description": "An array of CodeMirror tokens for which the continuous hinting should be suppressed. The token names vary between languages (modes)."
+    },
+    "suppressTriggerCharacterIn": {
+      "title": "Suppress invoke via trigger character in specific code fragments",
       "type": "array",
       "items": {
         "type": "string"
       },
       "default": ["comment", "string"],
-      "description": "An array of CodeMirror tokens for which the auto-invoke should be suppressed. Adding 'def' will prevent continuous hinting when writing a function name in Python, Julia, JavaScript and other languages. The token names vary between languages (modes)."
+      "description": "An array of CodeMirror tokens for which the auto-invoke after entering a trigger (e.g. `.` in Python or `::` in R) character should be suppressed. The token names vary between languages (modes)."
     },
     "kernelResponseTimeout": {
       "title": "Kernel completion response timeout",

packages/jupyterlab-lsp/src/features/completion/completion.ts

@@ -63,7 +63,7 @@ export class CompletionCM extends CodeMirrorIntegration {
       );
       (this.feature.labIntegration as CompletionLabIntegration)
         .invoke_completer(CompletionTriggerKind.TriggerCharacter)
-        .catch(console.warn);
+        .catch(this.console.warn);
       return;
     }
 
@@ -74,7 +74,7 @@ export class CompletionCM extends CodeMirrorIntegration {
     ) {
       (this.feature.labIntegration as CompletionLabIntegration)
         .invoke_completer(AdditionalCompletionTriggerKinds.AutoInvoked)
-        .catch(console.warn);
+        .catch(this.console.warn);
     }
   }
 }
@@ -198,13 +198,18 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
     completer.model = new LSPCompleterModel();
   }
 
-  get completer() {
+  protected get completer() {
+    // TODO upstream: make completer public?
     return this.current_completion_handler.completer;
   }
 
+  protected get model(): LSPCompleterModel {
+    return this.completer.model as LSPCompleterModel;
+  }
+
   invoke_completer(kind: ExtendedCompletionTriggerKind) {
+    // TODO: ideally this would not re-trigger if list of items not isIncomplete
     let command: string;
-
     this.current_completion_connector.trigger_kind = kind;
 
     if (this.adapterManager.currentAdapter instanceof NotebookAdapter) {
@@ -234,12 +239,9 @@ export class CompletionLabIntegration implements IFeatureLabIntegration {
   }
 
   private get current_items() {
-    // TODO upstream: make completer public?
-    let completer = this.current_completion_handler.completer;
-
     // TODO upstream: allow to get completionItems() without markup
     //   (note: not trivial as _markup() does filtering too)
-    return completer.model.completionItems();
+    return this.model.completionItems();
   }
 
   private get current_index() {

packages/jupyterlab-lsp/src/features/completion/completion_handler.ts

@@ -61,8 +61,12 @@ export class LSPConnector
     return this.options.settings.composite.kernelCompletionsFirst;
   }
 
-  protected get suppress_auto_invoke_in(): string[] {
-    return this.options.settings.composite.suppressInvokeIn;
+  protected get suppress_continuous_hinting_in(): string[] {
+    return this.options.settings.composite.suppressContinuousHintingIn;
+  }
+
+  protected get suppress_trigger_character_in(): string[] {
+    return this.options.settings.composite.suppressTriggerCharacterIn;
   }
 
   get should_show_documentation(): boolean {
@@ -155,9 +159,16 @@ export class LSPConnector
     const cursor = editor.getCursorPosition();
     const token = editor.getTokenForPosition(cursor);
 
-    if (this.suppress_auto_invoke_in.indexOf(token.type) !== -1) {
-      this.console.log('Suppressing completer auto-invoke in', token.type);
-      return;
+    if (this.trigger_kind == AdditionalCompletionTriggerKinds.AutoInvoked) {
+      if (this.suppress_continuous_hinting_in.indexOf(token.type) !== -1) {
+        this.console.debug('Suppressing completer auto-invoke in', token.type);
+        return;
+      }
+    } else if (this.trigger_kind == CompletionTriggerKind.TriggerCharacter) {
+      if (this.suppress_trigger_character_in.indexOf(token.type) !== -1) {
+        this.console.debug('Suppressing completer auto-invoke in', token.type);
+        return;
+      }
     }
 
     const start = editor.getPositionAt(token.offset);

packages/jupyterlab-lsp/src/features/completion/model.ts

@@ -35,12 +35,9 @@ export class GenericCompleterModel<
     let unfilteredItems = super.completionItems() as T[];
     this.query = query;
 
-    //if (query) {
     // always want to sort
     // TODO does this behave strangely with %%<tab> if always sorting?
     return this._sortAndFilter(query, unfilteredItems);
-    //}
-    //return unfilteredItems;
   }
 
   setCompletionItems(newValue: T[]) {