Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3d500ebd
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
3d500ebd
编写于
1月 11, 2021
作者:
A
Alexandru Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adopt proposed `CancellationError` (#93686)
上级
5c1543b5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
7 deletion
+12
-7
extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
...-language-features/src/languageFeatures/semanticTokens.ts
+1
-1
src/vs/editor/common/services/modelServiceImpl.ts
src/vs/editor/common/services/modelServiceImpl.ts
+2
-1
src/vs/workbench/api/common/extHostLanguageFeatures.ts
src/vs/workbench/api/common/extHostLanguageFeatures.ts
+9
-5
未找到文件。
extensions/typescript-language-features/src/languageFeatures/semanticTokens.ts
浏览文件 @
3d500ebd
...
...
@@ -95,7 +95,7 @@ class DocumentSemanticTokensProvider implements vscode.DocumentSemanticTokensPro
// as the new request will come in right after our response, we first wait for the document activity to stop
await
waitForDocumentChangesToEnd
(
document
);
throw
new
Error
(
'
busy
'
);
throw
new
vscode
.
CancellationError
(
);
}
const
tokenSpan
=
response
.
body
.
spans
;
...
...
src/vs/editor/common/services/modelServiceImpl.ts
浏览文件 @
3d500ebd
...
...
@@ -807,7 +807,8 @@ class ModelSemanticColoring extends Disposable {
contentChangeListener
.
dispose
();
this
.
_setDocumentSemanticTokens
(
provider
,
res
||
null
,
styling
,
pendingChanges
);
},
(
err
)
=>
{
if
(
!
err
||
typeof
err
.
message
!==
'
string
'
||
err
.
message
.
indexOf
(
'
busy
'
)
===
-
1
)
{
const
isExpectedError
=
err
&&
(
errors
.
isPromiseCanceledError
(
err
)
||
(
typeof
err
.
message
===
'
string
'
&&
err
.
message
.
indexOf
(
'
busy
'
)
!==
-
1
));
if
(
!
isExpectedError
)
{
errors
.
onUnexpectedError
(
err
);
}
...
...
src/vs/workbench/api/common/extHostLanguageFeatures.ts
浏览文件 @
3d500ebd
...
...
@@ -32,6 +32,7 @@ import { IdGenerator } from 'vs/base/common/idGenerator';
import
{
IExtHostApiDeprecationService
}
from
'
vs/workbench/api/common/extHostApiDeprecationService
'
;
import
{
Cache
}
from
'
./cache
'
;
import
{
StopWatch
}
from
'
vs/base/common/stopwatch
'
;
import
{
CancellationError
}
from
'
vs/base/common/errors
'
;
// --- adapter
...
...
@@ -1403,7 +1404,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
return
ExtHostLanguageFeatures
.
_handlePool
++
;
}
private
_withAdapter
<
A
,
R
>
(
handle
:
number
,
ctor
:
{
new
(...
args
:
any
[]):
A
;
},
callback
:
(
adapter
:
A
,
extension
:
IExtensionDescription
|
undefined
)
=>
Promise
<
R
>
,
fallbackValue
:
R
):
Promise
<
R
>
{
private
_withAdapter
<
A
,
R
>
(
handle
:
number
,
ctor
:
{
new
(...
args
:
any
[]):
A
;
},
callback
:
(
adapter
:
A
,
extension
:
IExtensionDescription
|
undefined
)
=>
Promise
<
R
>
,
fallbackValue
:
R
,
allowCancellationError
:
boolean
=
false
):
Promise
<
R
>
{
const
data
=
this
.
_adapter
.
get
(
handle
);
if
(
!
data
)
{
return
Promise
.
resolve
(
fallbackValue
);
...
...
@@ -1421,8 +1422,11 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
Promise
.
resolve
(
p
).
then
(
()
=>
this
.
_logService
.
trace
(
`[
${
extension
.
identifier
.
value
}
] provider DONE after
${
Date
.
now
()
-
t1
}
ms`
),
err
=>
{
this
.
_logService
.
error
(
`[
${
extension
.
identifier
.
value
}
] provider FAILED`
);
this
.
_logService
.
error
(
err
);
const
isExpectedError
=
allowCancellationError
&&
(
err
instanceof
CancellationError
);
if
(
!
isExpectedError
)
{
this
.
_logService
.
error
(
`[
${
extension
.
identifier
.
value
}
] provider FAILED`
);
this
.
_logService
.
error
(
err
);
}
}
);
}
...
...
@@ -1711,7 +1715,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
}
$provideDocumentSemanticTokens
(
handle
:
number
,
resource
:
UriComponents
,
previousResultId
:
number
,
token
:
CancellationToken
):
Promise
<
VSBuffer
|
null
>
{
return
this
.
_withAdapter
(
handle
,
DocumentSemanticTokensAdapter
,
adapter
=>
adapter
.
provideDocumentSemanticTokens
(
URI
.
revive
(
resource
),
previousResultId
,
token
),
null
);
return
this
.
_withAdapter
(
handle
,
DocumentSemanticTokensAdapter
,
adapter
=>
adapter
.
provideDocumentSemanticTokens
(
URI
.
revive
(
resource
),
previousResultId
,
token
),
null
,
true
);
}
$releaseDocumentSemanticTokens
(
handle
:
number
,
semanticColoringResultId
:
number
):
void
{
...
...
@@ -1725,7 +1729,7 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
}
$provideDocumentRangeSemanticTokens
(
handle
:
number
,
resource
:
UriComponents
,
range
:
IRange
,
token
:
CancellationToken
):
Promise
<
VSBuffer
|
null
>
{
return
this
.
_withAdapter
(
handle
,
DocumentRangeSemanticTokensAdapter
,
adapter
=>
adapter
.
provideDocumentRangeSemanticTokens
(
URI
.
revive
(
resource
),
range
,
token
),
null
);
return
this
.
_withAdapter
(
handle
,
DocumentRangeSemanticTokensAdapter
,
adapter
=>
adapter
.
provideDocumentRangeSemanticTokens
(
URI
.
revive
(
resource
),
range
,
token
),
null
,
true
);
}
//#endregion
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录