Merge pull request #4648 from 333fred/completion-details

Use new CompletionItem label API

Author: JoeRobich

package-lock.json

@@ -92,7 +92,7 @@
     "@types/semver": "5.5.0",
     "@types/tmp": "0.0.33",
     "@types/unzipper": "^0.9.1",
-    "@types/vscode": "1.57.0",
+    "@types/vscode": "1.58.0",
     "@types/yauzl": "2.9.1",
     "archiver": "5.3.0",
     "chai": "4.3.4",

package.json

@@ -124,9 +124,8 @@ export default class OmnisharpCompletionProvider extends AbstractProvider implem
         const insertRange = omnisharpCompletion.TextEdit ? mapRange(omnisharpCompletion.TextEdit) : undefined;
 
         return {
-            label: omnisharpCompletion.Label,
+            label: { label: omnisharpCompletion.Label, description: omnisharpCompletion.Detail },
             kind: omnisharpCompletion.Kind - 1,
-            detail: omnisharpCompletion.Detail,
             documentation: docs,
             commitCharacters: omnisharpCompletion.CommitCharacters,
             preselect: omnisharpCompletion.Preselect,

src/features/completionProvider.ts

@@ -9,7 +9,7 @@ import { configure as configureXHR, xhr } from 'request-light';
 
 import {
     CompletionItem, CompletionItemProvider, CompletionList, TextDocument, Position, Hover, HoverProvider,
-    CancellationToken, Range, TextEdit, MarkedString, DocumentSelector, languages, workspace
+    CancellationToken, Range, MarkedString, DocumentSelector, languages, workspace
 } from 'vscode';
 import CompositeDisposable from '../../CompositeDisposable';
 
@@ -113,10 +113,11 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
         let proposed: { [key: string]: boolean } = {};
         let collector: ISuggestionsCollector = {
             add: (suggestion: CompletionItem) => {
-                if (!proposed[suggestion.label]) {
-                    proposed[suggestion.label] = true;
+                if (!proposed[<string>suggestion.label]) {
+                    proposed[<string>suggestion.label] = true;
                     if (overwriteRange) {
-                        suggestion.textEdit = TextEdit.replace(overwriteRange, <string>suggestion.insertText);
+                        suggestion.insertText = suggestion.insertText;
+                        suggestion.range = overwriteRange;
                     }
 
                     items.push(suggestion);
@@ -162,4 +163,4 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
         }
         return text.substring(i + 1, position.character);
     }
-}
+}

src/features/json/jsonContributions.ts

@@ -185,7 +185,7 @@ export class ProjectJSONContribution implements IJSONContribution {
     public resolveSuggestion(item: CompletionItem): Thenable<CompletionItem> {
         if (item.kind === CompletionItemKind.Property) {
             let pack = item.label;
-            return this.getInfo(pack).then(info => {
+            return this.getInfo(<string>pack).then(info => {
                 if (info.description) {
                     item.documentation = info.description;
                 }
@@ -244,4 +244,4 @@ export class ProjectJSONContribution implements IJSONContribution {
         }
         return null;
     }
-}
+}