Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
17f4d534
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,发现更多精彩内容 >>
提交
17f4d534
编写于
5月 23, 2018
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[html] update dependencies
上级
105e928b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
149 addition
and
135 deletion
+149
-135
extensions/html-language-features/package.json
extensions/html-language-features/package.json
+2
-2
extensions/html-language-features/server/package.json
extensions/html-language-features/server/package.json
+5
-5
extensions/html-language-features/server/src/htmlServerMain.ts
...sions/html-language-features/server/src/htmlServerMain.ts
+92
-74
extensions/html-language-features/server/yarn.lock
extensions/html-language-features/server/yarn.lock
+30
-34
extensions/html-language-features/yarn.lock
extensions/html-language-features/yarn.lock
+20
-20
未找到文件。
extensions/html-language-features/package.json
浏览文件 @
17f4d534
...
...
@@ -173,8 +173,8 @@
},
"dependencies"
:
{
"vscode-extension-telemetry"
:
"0.0.17"
,
"vscode-languageclient"
:
"^4.
0.0
"
,
"vscode-languageserver-protocol-foldingprovider"
:
"^2.0.
0-next.2
"
,
"vscode-languageclient"
:
"^4.
1.4
"
,
"vscode-languageserver-protocol-foldingprovider"
:
"^2.0.
1
"
,
"vscode-nls"
:
"^3.2.2"
},
"devDependencies"
:
{
...
...
extensions/html-language-features/server/package.json
浏览文件 @
17f4d534
...
...
@@ -8,11 +8,11 @@
"node"
:
"*"
},
"dependencies"
:
{
"vscode-css-languageservice"
:
"^3.0.9-next.1
0
"
,
"vscode-html-languageservice"
:
"^2.1.3-next.
3
"
,
"vscode-languageserver"
:
"^4.
0.0
"
,
"vscode-languageserver-protocol-foldingprovider"
:
"^2.0.
0-next.2
"
,
"vscode-languageserver-types"
:
"^3.
6.1
"
,
"vscode-css-languageservice"
:
"^3.0.9-next.1
5
"
,
"vscode-html-languageservice"
:
"^2.1.3-next.
4
"
,
"vscode-languageserver"
:
"^4.
1.3
"
,
"vscode-languageserver-protocol-foldingprovider"
:
"^2.0.
1
"
,
"vscode-languageserver-types"
:
"^3.
7.2
"
,
"vscode-nls"
:
"^3.2.2"
,
"vscode-uri"
:
"^1.0.3"
},
...
...
extensions/html-language-features/server/src/htmlServerMain.ts
浏览文件 @
17f4d534
...
...
@@ -48,7 +48,7 @@ documents.listen(connection);
let
workspaceFolders
:
WorkspaceFolder
[]
=
[];
var
languageModes
:
LanguageModes
;
let
languageModes
:
LanguageModes
;
let
clientSnippetSupport
=
false
;
let
clientDynamicRegisterSupport
=
false
;
...
...
@@ -56,7 +56,7 @@ let scopedSettingsSupport = false;
let
workspaceFoldersSupport
=
false
;
let
foldingRangeLimit
=
Number
.
MAX_VALUE
;
var
globalSettings
:
Settings
=
{};
let
globalSettings
:
Settings
=
{};
let
documentSettings
:
{
[
key
:
string
]:
Thenable
<
Settings
>
}
=
{};
// remove document settings on close
documents
.
onDidClose
(
e
=>
{
...
...
@@ -67,8 +67,8 @@ function getDocumentSettings(textDocument: TextDocument, needsDocumentSettings:
if
(
scopedSettingsSupport
&&
needsDocumentSettings
())
{
let
promise
=
documentSettings
[
textDocument
.
uri
];
if
(
!
promise
)
{
le
t
scopeUri
=
textDocument
.
uri
;
le
t
configRequestParam
:
ConfigurationParams
=
{
items
:
[{
scopeUri
,
section
:
'
css
'
},
{
scopeUri
,
section
:
'
html
'
},
{
scopeUri
,
section
:
'
javascript
'
}]
};
cons
t
scopeUri
=
textDocument
.
uri
;
cons
t
configRequestParam
:
ConfigurationParams
=
{
items
:
[{
scopeUri
,
section
:
'
css
'
},
{
scopeUri
,
section
:
'
html
'
},
{
scopeUri
,
section
:
'
javascript
'
}]
};
promise
=
connection
.
sendRequest
(
ConfigurationRequest
.
type
,
configRequestParam
).
then
(
s
=>
({
css
:
s
[
0
],
html
:
s
[
1
],
javascript
:
s
[
2
]
}));
documentSettings
[
textDocument
.
uri
]
=
promise
;
}
...
...
@@ -80,7 +80,7 @@ function getDocumentSettings(textDocument: TextDocument, needsDocumentSettings:
// After the server has started the client sends an initialize request. The server receives
// in the passed params the rootPath of the workspace plus the client capabilities
connection
.
onInitialize
((
params
:
InitializeParams
):
InitializeResult
=>
{
le
t
initializationOptions
=
params
.
initializationOptions
;
cons
t
initializationOptions
=
params
.
initializationOptions
;
workspaceFolders
=
(
<
any
>
params
).
workspaceFolders
;
if
(
!
Array
.
isArray
(
workspaceFolders
))
{
...
...
@@ -103,7 +103,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
});
function
getClientCapability
<
T
>
(
name
:
string
,
def
:
T
)
{
le
t
keys
=
name
.
split
(
'
.
'
);
cons
t
keys
=
name
.
split
(
'
.
'
);
let
c
:
any
=
params
.
capabilities
;
for
(
let
i
=
0
;
c
&&
i
<
keys
.
length
;
i
++
)
{
if
(
!
c
.
hasOwnProperty
(
keys
[
i
]))
{
...
...
@@ -119,7 +119,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
scopedSettingsSupport
=
getClientCapability
(
'
workspace.configuration
'
,
false
);
workspaceFoldersSupport
=
getClientCapability
(
'
workspace.workspaceFolders
'
,
false
);
foldingRangeLimit
=
getClientCapability
(
'
textDocument.foldingRange.rangeLimit
'
,
Number
.
MAX_VALUE
);
le
t
capabilities
:
ServerCapabilities
&
FoldingRangeServerCapabilities
=
{
cons
t
capabilities
:
ServerCapabilities
&
FoldingRangeServerCapabilities
=
{
// Tell the client that the server works in FULL text document sync mode
textDocumentSync
:
documents
.
syncKind
,
completionProvider
:
clientSnippetSupport
?
{
resolveProvider
:
true
,
triggerCharacters
:
[
'
.
'
,
'
:
'
,
'
<
'
,
'
"
'
,
'
=
'
,
'
/
'
]
}
:
undefined
,
...
...
@@ -142,11 +142,11 @@ connection.onInitialized((p) => {
connection
.
client
.
register
(
DidChangeWorkspaceFoldersNotification
.
type
);
connection
.
onNotification
(
DidChangeWorkspaceFoldersNotification
.
type
,
e
=>
{
le
t
toAdd
=
e
.
event
.
added
;
le
t
toRemove
=
e
.
event
.
removed
;
le
t
updatedFolders
=
[];
cons
t
toAdd
=
e
.
event
.
added
;
cons
t
toRemove
=
e
.
event
.
removed
;
cons
t
updatedFolders
=
[];
if
(
workspaceFolders
)
{
for
(
le
t
folder
of
workspaceFolders
)
{
for
(
cons
t
folder
of
workspaceFolders
)
{
if
(
!
toRemove
.
some
(
r
=>
r
.
uri
===
folder
.
uri
)
&&
!
toAdd
.
some
(
r
=>
r
.
uri
===
folder
.
uri
))
{
updatedFolders
.
push
(
folder
);
}
...
...
@@ -168,10 +168,10 @@ connection.onDidChangeConfiguration((change) => {
// dynamically enable & disable the formatter
if
(
clientDynamicRegisterSupport
)
{
le
t
enableFormatter
=
globalSettings
&&
globalSettings
.
html
&&
globalSettings
.
html
.
format
&&
globalSettings
.
html
.
format
.
enable
;
cons
t
enableFormatter
=
globalSettings
&&
globalSettings
.
html
&&
globalSettings
.
html
.
format
&&
globalSettings
.
html
.
format
.
enable
;
if
(
enableFormatter
)
{
if
(
!
formatterRegistration
)
{
le
t
documentSelector
:
DocumentSelector
=
[{
language
:
'
html
'
},
{
language
:
'
handlebars
'
}];
// don't register razor, the formatter does more harm than good
cons
t
documentSelector
:
DocumentSelector
=
[{
language
:
'
html
'
},
{
language
:
'
handlebars
'
}];
// don't register razor, the formatter does more harm than good
formatterRegistration
=
connection
.
client
.
register
(
DocumentRangeFormattingRequest
.
type
,
{
documentSelector
});
}
}
else
if
(
formatterRegistration
)
{
...
...
@@ -197,7 +197,7 @@ documents.onDidClose(event => {
});
function
cleanPendingValidation
(
textDocument
:
TextDocument
):
void
{
le
t
request
=
pendingValidationRequests
[
textDocument
.
uri
];
cons
t
request
=
pendingValidationRequests
[
textDocument
.
uri
];
if
(
request
)
{
clearTimeout
(
request
);
delete
pendingValidationRequests
[
textDocument
.
uri
];
...
...
@@ -213,7 +213,7 @@ function triggerValidation(textDocument: TextDocument): void {
}
function
isValidationEnabled
(
languageId
:
string
,
settings
:
Settings
=
globalSettings
)
{
le
t
validationSettings
=
settings
&&
settings
.
html
&&
settings
.
html
.
validate
;
cons
t
validationSettings
=
settings
&&
settings
.
html
&&
settings
.
html
.
validate
;
if
(
validationSettings
)
{
return
languageId
===
'
css
'
&&
validationSettings
.
styles
!==
false
||
languageId
===
'
javascript
'
&&
validationSettings
.
scripts
!==
false
;
}
...
...
@@ -222,19 +222,19 @@ function isValidationEnabled(languageId: string, settings: Settings = globalSett
async
function
validateTextDocument
(
textDocument
:
TextDocument
)
{
try
{
le
t
version
=
textDocument
.
version
;
le
t
diagnostics
:
Diagnostic
[]
=
[];
cons
t
version
=
textDocument
.
version
;
cons
t
diagnostics
:
Diagnostic
[]
=
[];
if
(
textDocument
.
languageId
===
'
html
'
)
{
le
t
modes
=
languageModes
.
getAllModesInDocument
(
textDocument
);
le
t
settings
=
await
getDocumentSettings
(
textDocument
,
()
=>
modes
.
some
(
m
=>
!!
m
.
doValidation
));
t
extDocument
=
documents
.
get
(
textDocument
.
uri
);
if
(
textDocument
&&
t
extDocument
.
version
===
version
)
{
// check no new version has come in after in after the async op
cons
t
modes
=
languageModes
.
getAllModesInDocument
(
textDocument
);
cons
t
settings
=
await
getDocumentSettings
(
textDocument
,
()
=>
modes
.
some
(
m
=>
!!
m
.
doValidation
));
const
latestT
extDocument
=
documents
.
get
(
textDocument
.
uri
);
if
(
latestTextDocument
&&
latestT
extDocument
.
version
===
version
)
{
// check no new version has come in after in after the async op
modes
.
forEach
(
mode
=>
{
if
(
mode
.
doValidation
&&
isValidationEnabled
(
mode
.
getId
(),
settings
))
{
pushAll
(
diagnostics
,
mode
.
doValidation
(
t
extDocument
,
settings
));
pushAll
(
diagnostics
,
mode
.
doValidation
(
latestT
extDocument
,
settings
));
}
});
connection
.
sendDiagnostics
({
uri
:
t
extDocument
.
uri
,
diagnostics
});
connection
.
sendDiagnostics
({
uri
:
latestT
extDocument
.
uri
,
diagnostics
});
}
}
}
catch
(
e
)
{
...
...
@@ -245,6 +245,9 @@ async function validateTextDocument(textDocument: TextDocument) {
connection
.
onCompletion
(
async
(
textDocumentPosition
,
token
)
=>
{
return
runSafeAsync
(
async
()
=>
{
const
document
=
documents
.
get
(
textDocumentPosition
.
textDocument
.
uri
);
if
(
!
document
)
{
return
null
;
}
const
mode
=
languageModes
.
getModeAtPosition
(
document
,
textDocumentPosition
.
position
);
if
(
!
mode
||
!
mode
.
doComplete
)
{
return
{
isIncomplete
:
true
,
items
:
[]
};
...
...
@@ -260,8 +263,8 @@ connection.onCompletion(async (textDocumentPosition, token) => {
connection
.
telemetry
.
logEvent
({
key
:
'
html.embbedded.complete
'
,
value
:
{
languageId
:
mode
.
getId
()
}
});
}
le
t
settings
=
await
getDocumentSettings
(
document
,
()
=>
doComplete
.
length
>
2
);
le
t
result
=
doComplete
(
document
,
textDocumentPosition
.
position
,
settings
);
cons
t
settings
=
await
getDocumentSettings
(
document
,
()
=>
doComplete
.
length
>
2
);
cons
t
result
=
doComplete
(
document
,
textDocumentPosition
.
position
,
settings
);
return
result
;
},
null
,
`Error while computing completions for
${
textDocumentPosition
.
textDocument
.
uri
}
`
,
token
);
...
...
@@ -269,10 +272,10 @@ connection.onCompletion(async (textDocumentPosition, token) => {
connection
.
onCompletionResolve
((
item
,
token
)
=>
{
return
runSafe
(()
=>
{
le
t
data
=
item
.
data
;
cons
t
data
=
item
.
data
;
if
(
data
&&
data
.
languageId
&&
data
.
uri
)
{
le
t
mode
=
languageModes
.
getMode
(
data
.
languageId
);
le
t
document
=
documents
.
get
(
data
.
uri
);
cons
t
mode
=
languageModes
.
getMode
(
data
.
languageId
);
cons
t
document
=
documents
.
get
(
data
.
uri
);
if
(
mode
&&
mode
.
doResolve
&&
document
)
{
return
mode
.
doResolve
(
document
,
item
);
}
...
...
@@ -283,10 +286,12 @@ connection.onCompletionResolve((item, token) => {
connection
.
onHover
((
textDocumentPosition
,
token
)
=>
{
return
runSafe
(()
=>
{
let
document
=
documents
.
get
(
textDocumentPosition
.
textDocument
.
uri
);
let
mode
=
languageModes
.
getModeAtPosition
(
document
,
textDocumentPosition
.
position
);
if
(
mode
&&
mode
.
doHover
)
{
return
mode
.
doHover
(
document
,
textDocumentPosition
.
position
);
const
document
=
documents
.
get
(
textDocumentPosition
.
textDocument
.
uri
);
if
(
document
)
{
const
mode
=
languageModes
.
getModeAtPosition
(
document
,
textDocumentPosition
.
position
);
if
(
mode
&&
mode
.
doHover
)
{
return
mode
.
doHover
(
document
,
textDocumentPosition
.
position
);
}
}
return
null
;
},
null
,
`Error while computing hover for
${
textDocumentPosition
.
textDocument
.
uri
}
`
,
token
);
...
...
@@ -294,10 +299,12 @@ connection.onHover((textDocumentPosition, token) => {
connection
.
onDocumentHighlight
((
documentHighlightParams
,
token
)
=>
{
return
runSafe
(()
=>
{
let
document
=
documents
.
get
(
documentHighlightParams
.
textDocument
.
uri
);
let
mode
=
languageModes
.
getModeAtPosition
(
document
,
documentHighlightParams
.
position
);
if
(
mode
&&
mode
.
findDocumentHighlight
)
{
return
mode
.
findDocumentHighlight
(
document
,
documentHighlightParams
.
position
);
const
document
=
documents
.
get
(
documentHighlightParams
.
textDocument
.
uri
);
if
(
document
)
{
const
mode
=
languageModes
.
getModeAtPosition
(
document
,
documentHighlightParams
.
position
);
if
(
mode
&&
mode
.
findDocumentHighlight
)
{
return
mode
.
findDocumentHighlight
(
document
,
documentHighlightParams
.
position
);
}
}
return
[];
},
[],
`Error while computing document highlights for
${
documentHighlightParams
.
textDocument
.
uri
}
`
,
token
);
...
...
@@ -305,10 +312,12 @@ connection.onDocumentHighlight((documentHighlightParams, token) => {
connection
.
onDefinition
((
definitionParams
,
token
)
=>
{
return
runSafe
(()
=>
{
let
document
=
documents
.
get
(
definitionParams
.
textDocument
.
uri
);
let
mode
=
languageModes
.
getModeAtPosition
(
document
,
definitionParams
.
position
);
if
(
mode
&&
mode
.
findDefinition
)
{
return
mode
.
findDefinition
(
document
,
definitionParams
.
position
);
const
document
=
documents
.
get
(
definitionParams
.
textDocument
.
uri
);
if
(
document
)
{
const
mode
=
languageModes
.
getModeAtPosition
(
document
,
definitionParams
.
position
);
if
(
mode
&&
mode
.
findDefinition
)
{
return
mode
.
findDefinition
(
document
,
definitionParams
.
position
);
}
}
return
[];
},
null
,
`Error while computing definitions for
${
definitionParams
.
textDocument
.
uri
}
`
,
token
);
...
...
@@ -316,10 +325,12 @@ connection.onDefinition((definitionParams, token) => {
connection
.
onReferences
((
referenceParams
,
token
)
=>
{
return
runSafe
(()
=>
{
let
document
=
documents
.
get
(
referenceParams
.
textDocument
.
uri
);
let
mode
=
languageModes
.
getModeAtPosition
(
document
,
referenceParams
.
position
);
if
(
mode
&&
mode
.
findReferences
)
{
return
mode
.
findReferences
(
document
,
referenceParams
.
position
);
const
document
=
documents
.
get
(
referenceParams
.
textDocument
.
uri
);
if
(
document
)
{
const
mode
=
languageModes
.
getModeAtPosition
(
document
,
referenceParams
.
position
);
if
(
mode
&&
mode
.
findReferences
)
{
return
mode
.
findReferences
(
document
,
referenceParams
.
position
);
}
}
return
[];
},
[],
`Error while computing references for
${
referenceParams
.
textDocument
.
uri
}
`
,
token
);
...
...
@@ -327,10 +338,12 @@ connection.onReferences((referenceParams, token) => {
connection
.
onSignatureHelp
((
signatureHelpParms
,
token
)
=>
{
return
runSafe
(()
=>
{
let
document
=
documents
.
get
(
signatureHelpParms
.
textDocument
.
uri
);
let
mode
=
languageModes
.
getModeAtPosition
(
document
,
signatureHelpParms
.
position
);
if
(
mode
&&
mode
.
doSignatureHelp
)
{
return
mode
.
doSignatureHelp
(
document
,
signatureHelpParms
.
position
);
const
document
=
documents
.
get
(
signatureHelpParms
.
textDocument
.
uri
);
if
(
document
)
{
const
mode
=
languageModes
.
getModeAtPosition
(
document
,
signatureHelpParms
.
position
);
if
(
mode
&&
mode
.
doSignatureHelp
)
{
return
mode
.
doSignatureHelp
(
document
,
signatureHelpParms
.
position
);
}
}
return
null
;
},
null
,
`Error while computing signature help for
${
signatureHelpParms
.
textDocument
.
uri
}
`
,
token
);
...
...
@@ -338,24 +351,27 @@ connection.onSignatureHelp((signatureHelpParms, token) => {
connection
.
onDocumentRangeFormatting
(
async
(
formatParams
,
token
)
=>
{
return
runSafeAsync
(
async
()
=>
{
let
document
=
documents
.
get
(
formatParams
.
textDocument
.
uri
);
let
settings
=
await
getDocumentSettings
(
document
,
()
=>
true
);
if
(
!
settings
)
{
settings
=
globalSettings
;
}
let
unformattedTags
:
string
=
settings
&&
settings
.
html
&&
settings
.
html
.
format
&&
settings
.
html
.
format
.
unformatted
||
''
;
let
enabledModes
=
{
css
:
!
unformattedTags
.
match
(
/
\b
style
\b
/
),
javascript
:
!
unformattedTags
.
match
(
/
\b
script
\b
/
)
};
const
document
=
documents
.
get
(
formatParams
.
textDocument
.
uri
);
if
(
document
)
{
let
settings
=
await
getDocumentSettings
(
document
,
()
=>
true
);
if
(
!
settings
)
{
settings
=
globalSettings
;
}
const
unformattedTags
:
string
=
settings
&&
settings
.
html
&&
settings
.
html
.
format
&&
settings
.
html
.
format
.
unformatted
||
''
;
const
enabledModes
=
{
css
:
!
unformattedTags
.
match
(
/
\b
style
\b
/
),
javascript
:
!
unformattedTags
.
match
(
/
\b
script
\b
/
)
};
return
format
(
languageModes
,
document
,
formatParams
.
range
,
formatParams
.
options
,
settings
,
enabledModes
);
return
format
(
languageModes
,
document
,
formatParams
.
range
,
formatParams
.
options
,
settings
,
enabledModes
);
}
return
[];
},
[],
`Error while formatting range for
${
formatParams
.
textDocument
.
uri
}
`
,
token
);
});
connection
.
onDocumentLinks
((
documentLinkParam
,
token
)
=>
{
return
runSafe
(()
=>
{
le
t
document
=
documents
.
get
(
documentLinkParam
.
textDocument
.
uri
);
le
t
links
:
DocumentLink
[]
=
[];
cons
t
document
=
documents
.
get
(
documentLinkParam
.
textDocument
.
uri
);
cons
t
links
:
DocumentLink
[]
=
[];
if
(
document
)
{
le
t
documentContext
=
getDocumentContext
(
document
.
uri
,
workspaceFolders
);
cons
t
documentContext
=
getDocumentContext
(
document
.
uri
,
workspaceFolders
);
languageModes
.
getAllModesInDocument
(
document
).
forEach
(
m
=>
{
if
(
m
.
findDocumentLinks
)
{
pushAll
(
links
,
m
.
findDocumentLinks
(
document
,
documentContext
));
...
...
@@ -368,21 +384,23 @@ connection.onDocumentLinks((documentLinkParam, token) => {
connection
.
onDocumentSymbol
((
documentSymbolParms
,
token
)
=>
{
return
runSafe
(()
=>
{
let
document
=
documents
.
get
(
documentSymbolParms
.
textDocument
.
uri
);
let
symbols
:
SymbolInformation
[]
=
[];
languageModes
.
getAllModesInDocument
(
document
).
forEach
(
m
=>
{
if
(
m
.
findDocumentSymbols
)
{
pushAll
(
symbols
,
m
.
findDocumentSymbols
(
document
));
}
});
const
document
=
documents
.
get
(
documentSymbolParms
.
textDocument
.
uri
);
const
symbols
:
SymbolInformation
[]
=
[];
if
(
document
)
{
languageModes
.
getAllModesInDocument
(
document
).
forEach
(
m
=>
{
if
(
m
.
findDocumentSymbols
)
{
pushAll
(
symbols
,
m
.
findDocumentSymbols
(
document
));
}
});
}
return
symbols
;
},
[],
`Error while computing document symbols for
${
documentSymbolParms
.
textDocument
.
uri
}
`
,
token
);
});
connection
.
onRequest
(
DocumentColorRequest
.
type
,
(
params
,
token
)
=>
{
return
runSafe
(()
=>
{
le
t
infos
:
ColorInformation
[]
=
[];
le
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
cons
t
infos
:
ColorInformation
[]
=
[];
cons
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
if
(
document
)
{
languageModes
.
getAllModesInDocument
(
document
).
forEach
(
m
=>
{
if
(
m
.
findDocumentColors
)
{
...
...
@@ -396,9 +414,9 @@ connection.onRequest(DocumentColorRequest.type, (params, token) => {
connection
.
onRequest
(
ColorPresentationRequest
.
type
,
(
params
,
token
)
=>
{
return
runSafe
(()
=>
{
le
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
cons
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
if
(
document
)
{
le
t
mode
=
languageModes
.
getModeAtPosition
(
document
,
params
.
range
.
start
);
cons
t
mode
=
languageModes
.
getModeAtPosition
(
document
,
params
.
range
.
start
);
if
(
mode
&&
mode
.
getColorPresentations
)
{
return
mode
.
getColorPresentations
(
document
,
params
.
color
,
params
.
range
);
}
...
...
@@ -409,11 +427,11 @@ connection.onRequest(ColorPresentationRequest.type, (params, token) => {
connection
.
onRequest
(
TagCloseRequest
.
type
,
(
params
,
token
)
=>
{
return
runSafe
(()
=>
{
le
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
cons
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
if
(
document
)
{
le
t
pos
=
params
.
position
;
cons
t
pos
=
params
.
position
;
if
(
pos
.
character
>
0
)
{
le
t
mode
=
languageModes
.
getModeAtPosition
(
document
,
Position
.
create
(
pos
.
line
,
pos
.
character
-
1
));
cons
t
mode
=
languageModes
.
getModeAtPosition
(
document
,
Position
.
create
(
pos
.
line
,
pos
.
character
-
1
));
if
(
mode
&&
mode
.
doAutoClose
)
{
return
mode
.
doAutoClose
(
document
,
pos
);
}
...
...
@@ -425,7 +443,7 @@ connection.onRequest(TagCloseRequest.type, (params, token) => {
connection
.
onRequest
(
FoldingRangeRequest
.
type
,
(
params
,
token
)
=>
{
return
runSafe
(()
=>
{
le
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
cons
t
document
=
documents
.
get
(
params
.
textDocument
.
uri
);
if
(
document
)
{
return
getFoldingRanges
(
languageModes
,
document
,
foldingRangeLimit
,
token
);
}
...
...
extensions/html-language-features/server/yarn.lock
浏览文件 @
17f4d534
...
...
@@ -10,54 +10,50 @@
version "7.0.43"
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
vscode-css-languageservice@^3.0.9-next.1
0
:
version "3.0.9-next.1
0
"
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.1
0.tgz#be73d571221176b43d2c398a4a27f7d38206952d
"
vscode-css-languageservice@^3.0.9-next.1
5
:
version "3.0.9-next.1
5
"
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.1
5.tgz#67a91ed2cc7cf6ea46d45c2e9e9332c74df06ec5
"
dependencies:
vscode-languageserver-types "^3.
6.1
"
vscode-nls "^3.2.
1
"
vscode-languageserver-types "^3.
7.2
"
vscode-nls "^3.2.
2
"
vscode-html-languageservice@^2.1.3-next.
3
:
version "2.1.3-next.
3
"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.3-next.
3.tgz#20c4a0ae673815b598a7e132b5ef03a6920fa7af
"
vscode-html-languageservice@^2.1.3-next.
4
:
version "2.1.3-next.
4
"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.3-next.
4.tgz#b6785d9a1d212c163e6e7a4b2bfc728e413241ee
"
dependencies:
vscode-languageserver-types "^3.
6.1
"
vscode-nls "^3.2.
1
"
vscode-languageserver-types "^3.
7.2
"
vscode-nls "^3.2.
2
"
vscode-uri "^1.0.3"
vscode-jsonrpc@^3.6.
0
:
version "3.6.
0
"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.
0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4
"
vscode-jsonrpc@^3.6.
2
:
version "3.6.
2
"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.
2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8
"
vscode-languageserver-protocol-foldingprovider@^2.0.
0-next.2
:
version "2.0.
0-next.2
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.
0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0
"
vscode-languageserver-protocol-foldingprovider@^2.0.
1
:
version "2.0.
1
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.
1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd
"
dependencies:
vscode-languageserver-protocol "^3.
6.0
"
vscode-languageserver-types "^3.
6.0
"
vscode-languageserver-protocol "^3.
7.2
"
vscode-languageserver-types "^3.
7.2
"
vscode-languageserver-protocol@^3.
6.0
:
version "3.
6.0
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.
6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040
"
vscode-languageserver-protocol@^3.
7.2
:
version "3.
7.2
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.
7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6
"
dependencies:
vscode-jsonrpc "^3.6.
0
"
vscode-languageserver-types "^3.
6.0
"
vscode-jsonrpc "^3.6.
2
"
vscode-languageserver-types "^3.
7.2
"
vscode-languageserver-types@^3.
6.0, vscode-languageserver-types@^3.6.1
:
version "3.
6.1
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.
6.1.tgz#4bc06a48dff653495f12f94b8b1e228988a1748d
"
vscode-languageserver-types@^3.
7.2
:
version "3.
7.2
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.
7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb
"
vscode-languageserver@^4.
0.0
:
version "4.
0.0
"
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.
0.0.tgz#8b792f0d6d10acfe363d02371ed4ce53d08af88a
"
vscode-languageserver@^4.
1.3
:
version "4.
1.3
"
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.
1.3.tgz#937d37c955b6b9c2409388413cd6f54d1eb9fe7d
"
dependencies:
vscode-languageserver-protocol "^3.
6.0
"
vscode-languageserver-protocol "^3.
7.2
"
vscode-uri "^1.0.1"
vscode-nls@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.1.tgz#b1f3e04e8a94a715d5a7bcbc8339c51e6d74ca51"
vscode-nls@^3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
...
...
extensions/html-language-features/yarn.lock
浏览文件 @
17f4d534
...
...
@@ -34,33 +34,33 @@ vscode-extension-telemetry@0.0.17:
dependencies:
applicationinsights "1.0.1"
vscode-jsonrpc@^3.6.
0
:
version "3.6.
0
"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.
0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4
"
vscode-jsonrpc@^3.6.
2
:
version "3.6.
2
"
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.
2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8
"
vscode-languageclient@^4.
0.0
:
version "4.
0.0
"
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.
0.0.tgz#635f5bfbcfa1385dae489b394857f1db8b459a7d
"
vscode-languageclient@^4.
1.4
:
version "4.
1.4
"
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.
1.4.tgz#fff1a6bca4714835dca7fce35bc4ce81442fdf2c
"
dependencies:
vscode-languageserver-protocol "^3.
6.0
"
vscode-languageserver-protocol "^3.
7.2
"
vscode-languageserver-protocol-foldingprovider@^2.0.
0-next.2
:
version "2.0.
0-next.2
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.
0-next.2.tgz#fbb9cfdf5b8c4ac451826ba6312f1f88379f35b0
"
vscode-languageserver-protocol-foldingprovider@^2.0.
1
:
version "2.0.
1
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.
1.tgz#051d0d9e58d1b79dc4681acd48f21797f5515bfd
"
dependencies:
vscode-languageserver-protocol "^3.
6.0
"
vscode-languageserver-types "^3.
6.0
"
vscode-languageserver-protocol "^3.
7.2
"
vscode-languageserver-types "^3.
7.2
"
vscode-languageserver-protocol@^3.
6.0
:
version "3.
6.0
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.
6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040
"
vscode-languageserver-protocol@^3.
7.2
:
version "3.
7.2
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.
7.2.tgz#df58621c032139010888b6a9ddc969423f9ba9d6
"
dependencies:
vscode-jsonrpc "^3.6.
0
"
vscode-languageserver-types "^3.
6.0
"
vscode-jsonrpc "^3.6.
2
"
vscode-languageserver-types "^3.
7.2
"
vscode-languageserver-types@^3.
6.0
:
version "3.
6.1
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.
6.1.tgz#4bc06a48dff653495f12f94b8b1e228988a1748d
"
vscode-languageserver-types@^3.
7.2
:
version "3.
7.2
"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.
7.2.tgz#aad8846f8e3e27962648554de5a8417e358f34eb
"
vscode-nls@^3.2.2:
version "3.2.2"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录