Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 13:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

update to jsonc-parser 0.2.0

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-04-20 14:07:41 +02:00
parent 85f337ee08
commit 6e8f659617
5 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/javascript/src/features/jsonContributions.ts
View File

@@ -120,7 +120,7 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
let collectPromise : Thenable<any> = null;
if (location.completeProperty) {
if (location.isAtPropertyKey) {
let addValue = !location.previousNode || !location.previousNode.columnOffset;
let scanner = createScanner(document.getText(), true);
scanner.setPosition(offset);
@@ -128,7 +128,7 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
let isLast = scanner.getToken() === SyntaxKind.CloseBraceToken || scanner.getToken() === SyntaxKind.EOF;
collectPromise = this.jsonContribution.collectPropertySuggestions(fileName, location, currentWord, addValue, isLast, collector);
} else {
if (location.segments.length === 0) {
if (location.path.length === 0) {
collectPromise = this.jsonContribution.collectDefaultSuggestions(fileName, collector);
} else {
collectPromise = this.jsonContribution.collectValueSuggestions(fileName, location, collector);