Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Intelli-sense in extensions file #26564

Merged
merged 5 commits into from
May 17, 2017
Merged

Intelli-sense in extensions file #26564

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0756b0d
Intelli-sense in extensions file
teintinu May 12, 2017
a901530
Merge remote-tracking branch 'upstream/master' into 13456a
teintinu May 15, 2017
4ceb904
exclude vscode-markdown and already entered extensions
teintinu May 15, 2017
ba578c1
Merge remote-tracking branch 'upstream/master' into 13456a
teintinu May 16, 2017
ebb5c05
using json-parser to get existing recommendations
teintinu May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions extensions/configuration-editing/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'use strict';

import * as vscode from 'vscode';
import { getLocation, visit } from 'jsonc-parser';
import { getLocation, visit, parse } from 'jsonc-parser';
import * as path from 'path';
import { SettingsDocument } from './settingsDocumentHelper';

Expand All @@ -24,6 +24,9 @@ export function activate(context): void {
//settings.json suggestions
context.subscriptions.push(registerSettingsCompletions());

//extensions.json suggestions
context.subscriptions.push(registerExtensionsCompletions());

// launch.json decorations
context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(editor => updateLaunchJsonDecorations(editor), null, context.subscriptions));
context.subscriptions.push(vscode.workspace.onDidChangeTextDocument(event => {
Expand Down Expand Up @@ -61,11 +64,34 @@ function registerSettingsCompletions(): vscode.Disposable {
});
}

function newSimpleCompletionItem(text: string, range: vscode.Range, description?: string): vscode.CompletionItem {
function registerExtensionsCompletions(): vscode.Disposable {
return vscode.languages.registerCompletionItemProvider({ pattern: '**/extensions.json' }, {
provideCompletionItems(document, position, token) {
const location = getLocation(document.getText(), document.offsetAt(position));
const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position);
if (location.path[0] === 'recommendations') {
const config = parse(document.getText());
const alreadyEnteredExtensions = config && config.recommendations || [];
if (Array.isArray(alreadyEnteredExtensions)) {
return vscode.extensions.all
.filter(e => !(
e.id.startsWith('vscode.')
|| e.id === 'Microsoft.vscode-markdown'
|| alreadyEnteredExtensions.indexOf(e.id) > -1
))
.map(e => newSimpleCompletionItem(e.id, range, undefined, '"' + e.id + '"'));
}
}
return [];
}
});
}

function newSimpleCompletionItem(text: string, range: vscode.Range, description?: string, insertText?: string): vscode.CompletionItem {
const item = new vscode.CompletionItem(text);
item.kind = vscode.CompletionItemKind.Value;
item.detail = description;
item.insertText = text;
item.insertText = insertText || text;
item.range = range;

return item;
Expand Down