feat(completion): add suggest.invalidInsertCharacters (#1195)

neoclide · Sep 23, 2019 · 582aa07 · 582aa07
1 parent d6346fb
commit 582aa07
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/data/schema.json b/data/schema.json
@@ -450,6 +450,14 @@
       },
       "additionalProperties": false
     },
+    "suggest.invalidInsertCharacters": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "Invalid character for strip valid word when inserting text of complete item.",
+      "default": [" ", "(", "<", "{", "[", "\r", "\n"]
+    },
     "diagnostic.enable": {
       "type": "boolean",
       "description": "Set to false to disable diagnostic display",

diff --git a/src/languages.ts b/src/languages.ts
@@ -46,6 +46,7 @@ interface CompleteConfig {
   waitTime: number
   detailMaxLength: number
   detailField: string
+  invalidInsertCharacters: string[]
 }
 
 function fixDocumentation(str: string): string {
@@ -170,7 +171,8 @@ class Languages {
       echodocSupport: getConfig<boolean>('echodocSupport', false),
       waitTime: getConfig<number>('triggerCompletionWait', 60),
       detailField: getConfig<string>('detailField', 'abbr'),
-      detailMaxLength: getConfig<number>('detailMaxLength', 50)
+      detailMaxLength: getConfig<number>('detailMaxLength', 50),
+      invalidInsertCharacters: getConfig<string[]>('invalidInsertCharacters', [' ', '(', '<', '{', '[', '\r', '\n']),
     }
   }
 
@@ -716,7 +718,7 @@ class Languages {
   }
 
   private convertVimCompleteItem(item: CompletionItem, shortcut: string, opt: CompleteOption): VimCompleteItem {
-    let { echodocSupport, detailField, detailMaxLength } = this.completeConfig
+    let { echodocSupport, detailField, detailMaxLength, invalidInsertCharacters } = this.completeConfig
     let hasAdditionalEdit = item.additionalTextEdits && item.additionalTextEdits.length > 0
     let isSnippet = item.insertTextFormat === InsertTextFormat.Snippet || hasAdditionalEdit
     let label = item.label.trim()
@@ -727,7 +729,7 @@ class Languages {
       item.insertTextFormat = InsertTextFormat.PlainText
     }
     let obj: VimCompleteItem = {
-      word: complete.getWord(item, opt),
+      word: complete.getWord(item, opt, invalidInsertCharacters),
       abbr: label,
       menu: `[${shortcut}]`,
       kind: complete.completionKindString(item.kind, this.completionItemKindMap, this.completeConfig.defaultKindText),

diff --git a/src/util/complete.ts b/src/util/complete.ts
@@ -3,7 +3,6 @@ import { SnippetParser } from '../snippets/parser'
 import { CompleteOption } from '../types'
 import { byteSlice, characterIndex } from './string'
 const logger = require('./logger')('util-complete')
-const invalidInsertCharacters = [' ', '(', '<', '{', '[', '\r', '\n']
 
 export function getPosition(opt: CompleteOption): Position {
   let { line, linenr, colnr } = opt
@@ -14,7 +13,7 @@ export function getPosition(opt: CompleteOption): Position {
   }
 }
 
-export function getWord(item: CompletionItem, opt: CompleteOption): string {
+export function getWord(item: CompletionItem, opt: CompleteOption, invalidInsertCharacters: string[]): string {
   // tslint:disable-next-line: deprecation
   let { label, data, insertTextFormat, insertText, textEdit } = item
   let word: string