Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c249cfd0
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c249cfd0
编写于
6月 05, 2020
作者:
S
Sana Ajani
提交者:
GitHub
6月 05, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into playwright-npm
上级
90c85dd3
54054c34
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
19 deletion
+14
-19
extensions/html-language-features/server/package.json
extensions/html-language-features/server/package.json
+1
-1
extensions/html-language-features/server/yarn.lock
extensions/html-language-features/server/yarn.lock
+4
-4
src/vs/editor/contrib/suggest/suggest.ts
src/vs/editor/contrib/suggest/suggest.ts
+8
-7
src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts
...vs/workbench/services/bulkEdit/browser/bulkEditService.ts
+1
-7
未找到文件。
extensions/html-language-features/server/package.json
浏览文件 @
c249cfd0
...
...
@@ -10,7 +10,7 @@
"main"
:
"./out/htmlServerMain"
,
"dependencies"
:
{
"vscode-css-languageservice"
:
"^4.1.2"
,
"vscode-html-languageservice"
:
"^3.1.0-next.
1
"
,
"vscode-html-languageservice"
:
"^3.1.0-next.
2
"
,
"vscode-languageserver"
:
"^6.1.1"
,
"vscode-nls"
:
"^4.1.2"
,
"vscode-uri"
:
"^2.1.2"
...
...
extensions/html-language-features/server/yarn.lock
浏览文件 @
c249cfd0
...
...
@@ -736,10 +736,10 @@ vscode-css-languageservice@^4.1.2:
vscode-nls "^4.1.2"
vscode-uri "^2.1.1"
vscode-html-languageservice@^3.1.0-next.
1
:
version "3.1.0-next.
1
"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.1.0-next.
1.tgz#d981cf3026f24c674f749992a72f5c0aedb76e7a
"
integrity sha512-
p/R6yIt01rFL2wjlSOCYSVyELG6t2zOLyoVrJPXHFwuQ25Gi3NRHapE+2tXCqJjd2Ff2Bqu2Cs3+jf1DRS0/zA
==
vscode-html-languageservice@^3.1.0-next.
2
:
version "3.1.0-next.
2
"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.1.0-next.
2.tgz#a6ad42ed0ad0adda9ad0c5d34b2ac0d05076190e
"
integrity sha512-
cohfk2Ez8MrnT/8upnKsOc2FK2T+lU2LsBgg0L2P2BHjVzq4LMCOiYcwNeq+u9y2L5ck9E6SFw1BTdyZ5377KQ
==
dependencies:
vscode-languageserver-textdocument "^1.0.1"
vscode-languageserver-types "^3.15.1"
...
...
src/vs/editor/contrib/suggest/suggest.ts
浏览文件 @
c249cfd0
...
...
@@ -55,12 +55,15 @@ export class CompletionItem {
idx
?:
number
;
word
?:
string
;
// resolving
private
_isResolved
:
boolean
=
false
;
private
_resolveCache
?:
Promise
<
void
>
;
constructor
(
readonly
position
:
IPosition
,
readonly
completion
:
modes
.
CompletionItem
,
readonly
container
:
modes
.
CompletionList
,
readonly
provider
:
modes
.
CompletionItemProvider
,
model
:
ITextModel
)
{
this
.
textLabel
=
typeof
completion
.
label
===
'
string
'
?
completion
.
label
...
...
@@ -104,14 +107,12 @@ export class CompletionItem {
}
}
// resolving
// ---- resolving
get
isResolved
()
{
return
Boolean
(
this
.
_isResolved
)
;
return
this
.
_isResolved
;
}
private
_resolveCache
?:
Promise
<
void
>
;
private
_isResolved
?:
boolean
;
async
resolve
(
token
:
CancellationToken
)
{
if
(
!
this
.
_resolveCache
)
{
const
sub
=
token
.
onCancellationRequested
(()
=>
{
...
...
@@ -194,7 +195,7 @@ export async function provideSuggestionItems(
if
(
!
suggestion
.
sortText
)
{
suggestion
.
sortText
=
typeof
suggestion
.
label
===
'
string
'
?
suggestion
.
label
:
suggestion
.
label
.
name
;
}
result
.
push
(
new
CompletionItem
(
position
,
suggestion
,
container
,
provider
,
model
));
result
.
push
(
new
CompletionItem
(
position
,
suggestion
,
container
,
provider
));
}
}
if
(
isDisposable
(
container
))
{
...
...
src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts
浏览文件 @
c249cfd0
...
...
@@ -167,15 +167,9 @@ class BulkEditModel implements IDisposable {
this
.
_edits
.
forEach
((
value
,
key
)
=>
{
const
promise
=
this
.
_textModelResolverService
.
createModelReference
(
URI
.
parse
(
key
)).
then
(
async
ref
=>
{
const
model
=
ref
.
object
;
if
(
!
model
||
!
model
.
textEditorModel
)
{
throw
new
Error
(
`Cannot load file
${
key
}
`
);
}
let
task
:
ModelEditTask
;
let
makeMinimal
=
false
;
if
(
this
.
_editor
&&
this
.
_editor
.
hasModel
()
&&
this
.
_editor
.
getModel
().
uri
.
toString
()
===
model
.
textEditorModel
.
uri
.
toString
())
{
if
(
this
.
_editor
&&
this
.
_editor
.
hasModel
()
&&
this
.
_editor
.
getModel
().
uri
.
toString
()
===
ref
.
object
.
textEditorModel
.
uri
.
toString
())
{
task
=
new
EditorEditTask
(
ref
,
this
.
_editor
);
makeMinimal
=
true
;
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录