Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 f10b71e9 编写于 作者: R Ramya Achutha Rao
浏览文件
操作

Avoid setting completion items as undefined

上级 fd2ea5fb
隐藏空白更改
内联 并排
Showing with 18 addition and 18 deletion
extensions/css/server/package.json
浏览文件 @ f10b71e9
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
}, },
"dependencies": { "dependencies": {
"vscode-css-languageservice": "^3.0.6", "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" "vscode-languageserver": "4.0.0-next.4"
}, },
"devDependencies": { "devDependencies": {
......
extensions/css/server/src/cssServerMain.ts
浏览文件 @ f10b71e9
...@@ -215,8 +215,8 @@ connection.onCompletion(textDocumentPosition => { ...@@ -215,8 +215,8 @@ connection.onCompletion(textDocumentPosition => {
cachedCompletionList = null; cachedCompletionList = null;
let emmetCompletionList: CompletionList = { let emmetCompletionList: CompletionList = {
isIncomplete: true, isIncomplete: false,
items: undefined items: []
}; };
const emmetCompletionParticipant: ICompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, document.languageId, emmetSettings, emmetCompletionList); const emmetCompletionParticipant: ICompletionParticipant = getEmmetCompletionParticipants(document, textDocumentPosition.position, document.languageId, emmetSettings, emmetCompletionList);
getLanguageService(document).setCompletionParticipants([emmetCompletionParticipant]); getLanguageService(document).setCompletionParticipants([emmetCompletionParticipant]);
...@@ -227,7 +227,7 @@ connection.onCompletion(textDocumentPosition => { ...@@ -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)) { if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
emmetCompletionList.items.shift(); emmetCompletionList.items.shift();
} }
return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] }; return { isIncomplete: emmetCompletionList.isIncomplete || result.isIncomplete, items: [...emmetCompletionList.items, ...result.items] };
} }
return result; return result;
}, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`); }, null, `Error while computing completions for ${textDocumentPosition.textDocument.uri}`);
......
extensions/css/server/yarn.lock
浏览文件 @ f10b71e9
...@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6: ...@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6:
vscode-languageserver-types "^3.6.0-next.1" vscode-languageserver-types "^3.6.0-next.1"
vscode-nls "^2.0.1" vscode-nls "^2.0.1"
vscode-emmet-helper@^1.1.37: vscode-emmet-helper@^1.1.38:
version "1.1.37" version "1.1.38"
resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53" resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8"
dependencies: dependencies:
"@emmetio/extract-abbreviation" "0.1.6" "@emmetio/extract-abbreviation" "0.1.6"
jsonc-parser "^1.0.0" jsonc-parser "^1.0.0"
......
extensions/emmet/package.json
浏览文件 @ f10b71e9
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
"@emmetio/html-matcher": "^0.3.3", "@emmetio/html-matcher": "^0.3.3",
"@emmetio/css-parser": "ramya-rao-a/css-parser#vscode", "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
"@emmetio/math-expression": "^0.1.1", "@emmetio/math-expression": "^0.1.1",
"vscode-emmet-helper": "^1.1.37", "vscode-emmet-helper": "^1.1.38",
"vscode-languageserver-types": "^3.5.0", "vscode-languageserver-types": "^3.5.0",
"image-size": "^0.5.2", "image-size": "^0.5.2",
"vscode-nls": "3.2.1" "vscode-nls": "3.2.1"
......
extensions/emmet/yarn.lock
浏览文件 @ f10b71e9
...@@ -2052,9 +2052,9 @@ vinyl@~2.0.1: ...@@ -2052,9 +2052,9 @@ vinyl@~2.0.1:
remove-trailing-separator "^1.0.1" remove-trailing-separator "^1.0.1"
replace-ext "^1.0.0" replace-ext "^1.0.0"
vscode-emmet-helper@^1.1.37: vscode-emmet-helper@^1.1.38:
version "1.1.37" version "1.1.38"
resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53" resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8"
dependencies: dependencies:
"@emmetio/extract-abbreviation" "0.1.6" "@emmetio/extract-abbreviation" "0.1.6"
jsonc-parser "^1.0.0" jsonc-parser "^1.0.0"
......
extensions/html/server/package.json
浏览文件 @ f10b71e9
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
}, },
"dependencies": { "dependencies": {
"vscode-css-languageservice": "^3.0.6", "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-html-languageservice": "^2.0.17-next.3",
"vscode-languageserver": "4.0.0-next.4", "vscode-languageserver": "4.0.0-next.4",
"vscode-languageserver-types": "^3.6.0-next.1", "vscode-languageserver-types": "^3.6.0-next.1",
......
extensions/html/server/src/htmlServerMain.ts
浏览文件 @ f10b71e9
...@@ -276,8 +276,8 @@ connection.onCompletion(async textDocumentPosition => { ...@@ -276,8 +276,8 @@ connection.onCompletion(async textDocumentPosition => {
cachedCompletionList = null; cachedCompletionList = null;
let emmetCompletionList: CompletionList = { let emmetCompletionList: CompletionList = {
isIncomplete: true, isIncomplete: false,
items: undefined items: []
}; };
let pathCompletionList: CompletionList = { let pathCompletionList: CompletionList = {
isIncomplete: false, isIncomplete: false,
...@@ -305,7 +305,7 @@ connection.onCompletion(async textDocumentPosition => { ...@@ -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)) { if (emmetCompletionList.items.length && hexColorRegex.test(emmetCompletionList.items[0].label) && result.items.some(x => x.label === emmetCompletionList.items[0].label)) {
emmetCompletionList.items.shift(); emmetCompletionList.items.shift();
} }
return { isIncomplete: true, items: [...emmetCompletionList.items, ...result.items] }; return { isIncomplete: emmetCompletionList.isIncomplete || result.isIncomplete, items: [...emmetCompletionList.items, ...result.items] };
} }
return result; return result;
......
extensions/html/server/yarn.lock
浏览文件 @ f10b71e9
...@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6: ...@@ -25,9 +25,9 @@ vscode-css-languageservice@^3.0.6:
vscode-languageserver-types "^3.6.0-next.1" vscode-languageserver-types "^3.6.0-next.1"
vscode-nls "^2.0.1" vscode-nls "^2.0.1"
vscode-emmet-helper@^1.1.37: vscode-emmet-helper@1.1.38:
version "1.1.37" version "1.1.38"
resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.37.tgz#239636ec559d98b23994394028dd1535f49e8a53" resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.38.tgz#6b7de1abe39f8b41d4713c4e85ace4a7261ef0d8"
dependencies: dependencies:
"@emmetio/extract-abbreviation" "0.1.6" "@emmetio/extract-abbreviation" "0.1.6"
jsonc-parser "^1.0.0" jsonc-parser "^1.0.0"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或