From f10b71e9949eef01316e460914521c6f0cddab61 Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Mon, 26 Feb 2018 17:52:10 -0800 Subject: [PATCH] Avoid setting completion items as undefined --- extensions/css/server/package.json | 2 +- extensions/css/server/src/cssServerMain.ts | 6 +++--- extensions/css/server/yarn.lock | 6 +++--- extensions/emmet/package.json | 2 +- extensions/emmet/yarn.lock | 6 +++--- extensions/html/server/package.json | 2 +- extensions/html/server/src/htmlServerMain.ts | 6 +++--- extensions/html/server/yarn.lock | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/extensions/css/server/package.json b/extensions/css/server/package.json index 7f71131e6bf..e2471627330 100644 --- a/extensions/css/server/package.json +++ b/extensions/css/server/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "vscode-css-languageservice": "^3.0.6", - "vscode-emmet-helper": "^1.1.37", + "vscode-emmet-helper": "^1.1.38", "vscode-languageserver": "4.0.0-next.4" }, "devDependencies": { diff --git a/extensions/css/server/src/cssServerMain.ts b/extensions/css/server/src/cssServerMain.ts index 0a63d245559..6b7477305cf 100644 --- a/extensions/css/server/src/cssServerMain.ts +++ b/extensions/css/server/src/cssServerMain.ts @@ -215,8 +215,8 @@ connection.onCompletion(textDocumentPosition => { cachedCompletionList = null; let emmetCompletionList: CompletionList = { - isIncomplete: true, - items: undefined + isIncomplete: false, + items: [] }; const emmetCompletionParticipant: ICompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, document.languageId, emmetSettings, emmetCompletionList); getLanguageService(document).setCompletionParticipants([emmetCompletionParticipant]); @@ -227,7 +227,7 @@ connection.onCompletion(textDocumentPosition => { if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) { emmetCompletionList.items.shift(); } - return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] }; + return { isIncomplete: emmetCompletionList.isIncomplete || result.isIncomplete, items: [...emmetCompletionList.items, ...result.items] }; } return result; }, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`); diff --git a/extensions/css/server/yarn.lock b/extensions/css/server/yarn.lock index fb9ea323637..495deb4b73a 100644 --- a/extensions/css/server/yarn.lock +++ b/extensions/css/server/yarn.lock @@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6: vscode-languageserver-types "^3.6.0-next.1" vscode-nls "^2.0.1" -vscode-emmet-helper@^1.1.37: - version "1.1.37" - resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53" +vscode-emmet-helper@^1.1.38: + version "1.1.38" + resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8" dependencies: "@emmetio/extract-abbreviation" "0.1.6" jsonc-parser "^1.0.0" diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json index d704fb39b4f..3d1702b8565 100644 --- a/extensions/emmet/package.json +++ b/extensions/emmet/package.json @@ -337,7 +337,7 @@ "@emmetio/html-matcher": "^0.3.3", "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode", "@emmetio/math-expression": "^0.1.1", - "vscode-emmet-helper": "^1.1.37", + "vscode-emmet-helper": "^1.1.38", "vscode-languageserver-types": "^3.5.0", "image-size": "^0.5.2", "vscode-nls": "3.2.1" diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock index 89b32d0ba96..76ab5219705 100644 --- a/extensions/emmet/yarn.lock +++ b/extensions/emmet/yarn.lock @@ -2052,9 +2052,9 @@ vinyl@~2.0.1: remove-trailing-separator "^1.0.1" replace-ext "^1.0.0" -vscode-emmet-helper@^1.1.37: - version "1.1.37" - resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53" +vscode-emmet-helper@^1.1.38: + version "1.1.38" + resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8" dependencies: "@emmetio/extract-abbreviation" "0.1.6" jsonc-parser "^1.0.0" diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json index 91553664578..f582578707d 100644 --- a/extensions/html/server/package.json +++ b/extensions/html/server/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "vscode-css-languageservice": "^3.0.6", - "vscode-emmet-helper": "^1.1.37", + "vscode-emmet-helper": "1.1.38", "vscode-html-languageservice": "^2.0.17-next.3", "vscode-languageserver": "4.0.0-next.4", "vscode-languageserver-types": "^3.6.0-next.1", diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts index 33e7e335e3a..184c0e77c47 100644 --- a/extensions/html/server/src/htmlServerMain.ts +++ b/extensions/html/server/src/htmlServerMain.ts @@ -276,8 +276,8 @@ connection.onCompletion(async textDocumentPosition => { cachedCompletionList = null; let emmetCompletionList: CompletionList = { - isIncomplete: true, - items: undefined + isIncomplete: false, + items: [] }; let pathCompletionList: CompletionList = { isIncomplete: false, @@ -305,7 +305,7 @@ connection.onCompletion(async textDocumentPosition => { if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) { emmetCompletionList.items.shift(); } - return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] }; + return { isIncomplete: emmetCompletionList.isIncomplete || result.isIncomplete, items: [...emmetCompletionList.items, ...result.items] }; } return result; diff --git a/extensions/html/server/yarn.lock b/extensions/html/server/yarn.lock index 43f3d47cf2d..298ecf5c6ba 100644 --- a/extensions/html/server/yarn.lock +++ b/extensions/html/server/yarn.lock @@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6: vscode-languageserver-types "^3.6.0-next.1" vscode-nls "^2.0.1" -vscode-emmet-helper@^1.1.37: - version "1.1.37" - resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53" +vscode-emmet-helper@1.1.38: + version "1.1.38" + resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8" dependencies: "@emmetio/extract-abbreviation" "0.1.6" jsonc-parser "^1.0.0" -- GitLab