Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
cd4d7e6c
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,发现更多精彩内容 >>
提交
cd4d7e6c
编写于
11月 04, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix more node 12 typing errors
For #82514
上级
a9773829
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
11 addition
and
5 deletion
+11
-5
src/vs/workbench/api/common/extHostDocuments.ts
src/vs/workbench/api/common/extHostDocuments.ts
+2
-1
src/vs/workbench/api/node/extHostDebugService.ts
src/vs/workbench/api/node/extHostDebugService.ts
+2
-2
src/vs/workbench/api/node/extHostExtensionService.ts
src/vs/workbench/api/node/extHostExtensionService.ts
+1
-0
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
.../workbench/contrib/preferences/browser/settingsEditor2.ts
+2
-2
src/vs/workbench/contrib/terminal/node/terminalProcess.ts
src/vs/workbench/contrib/terminal/node/terminalProcess.ts
+4
-0
未找到文件。
src/vs/workbench/api/common/extHostDocuments.ts
浏览文件 @
cd4d7e6c
...
...
@@ -12,6 +12,7 @@ import { ExtHostDocumentData, setWordDefinitionFor } from 'vs/workbench/api/comm
import
{
ExtHostDocumentsAndEditors
}
from
'
vs/workbench/api/common/extHostDocumentsAndEditors
'
;
import
*
as
TypeConverters
from
'
vs/workbench/api/common/extHostTypeConverters
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
assertIsDefined
}
from
'
vs/base/common/types
'
;
export
class
ExtHostDocuments
implements
ExtHostDocumentsShape
{
...
...
@@ -84,7 +85,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
if
(
!
promise
)
{
promise
=
this
.
_proxy
.
$tryOpenDocument
(
uri
).
then
(()
=>
{
this
.
_documentLoader
.
delete
(
uri
.
toString
());
return
this
.
_documentsAndEditors
.
getDocument
(
uri
);
return
assertIsDefined
(
this
.
_documentsAndEditors
.
getDocument
(
uri
)
);
},
err
=>
{
this
.
_documentLoader
.
delete
(
uri
.
toString
());
return
Promise
.
reject
(
err
);
...
...
src/vs/workbench/api/node/extHostDebugService.ts
浏览文件 @
cd4d7e6c
...
...
@@ -383,7 +383,7 @@ export class ExtHostDebugService implements IExtHostDebugService, ExtHostDebugSe
public
async
$substituteVariables
(
folderUri
:
UriComponents
|
undefined
,
config
:
IConfig
):
Promise
<
IConfig
>
{
if
(
!
this
.
_variableResolver
)
{
const
[
workspaceFolders
,
configProvider
]
=
await
Promise
.
all
([
this
.
_workspaceService
.
getWorkspaceFolders2
(),
this
.
_configurationService
.
getConfigProvider
()]);
this
.
_variableResolver
=
new
ExtHostVariableResolverService
(
workspaceFolders
||
[],
this
.
_editorsService
,
configProvider
);
this
.
_variableResolver
=
new
ExtHostVariableResolverService
(
workspaceFolders
||
[],
this
.
_editorsService
,
configProvider
!
);
}
let
ws
:
IWorkspaceFolder
|
undefined
;
const
folder
=
await
this
.
getFolder
(
folderUri
);
...
...
@@ -783,7 +783,7 @@ export class ExtHostDebugService implements IExtHostDebugService, ExtHostDebugSe
}
return
undefined
;
}),
new
Promise
((
resolve
,
reject
)
=>
{
new
Promise
<
never
>
((
resolve
,
reject
)
=>
{
const
timeout
=
setTimeout
(()
=>
{
clearTimeout
(
timeout
);
reject
(
new
Error
(
'
timeout
'
));
...
...
src/vs/workbench/api/node/extHostExtensionService.ts
浏览文件 @
cd4d7e6c
...
...
@@ -72,6 +72,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {
return
nativeProcessSend
.
apply
(
process
,
args
);
}
mainThreadConsole
.
$logExtensionHostMessage
(
args
[
0
]);
return
false
;
};
}
...
...
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
浏览文件 @
cd4d7e6c
...
...
@@ -1305,7 +1305,7 @@ export class SettingsEditor2 extends BaseEditor {
private
_filterOrSearchPreferencesModel
(
filter
:
string
,
model
:
ISettingsEditorModel
,
provider
?:
ISearchProvider
,
token
?:
CancellationToken
):
Promise
<
ISearchResult
|
null
>
{
const
searchP
=
provider
?
provider
.
searchModel
(
model
,
token
)
:
Promise
.
resolve
(
null
);
return
searchP
.
then
<
ISearchResult
>
(
null
,
err
=>
{
.
then
<
ISearchResult
,
ISearchResult
|
null
>
(
undefined
,
err
=>
{
if
(
isPromiseCanceledError
(
err
))
{
return
Promise
.
reject
(
err
);
}
else
{
...
...
@@ -1321,7 +1321,7 @@ export class SettingsEditor2 extends BaseEditor {
this
.
telemetryService
.
publicLog
(
'
settingsEditor.searchError
'
,
{
message
,
filter
});
this
.
logService
.
info
(
'
Setting search error:
'
+
message
);
}
return
Promise
.
resolve
(
null
)
;
return
null
;
}
});
}
...
...
src/vs/workbench/contrib/terminal/node/terminalProcess.ts
浏览文件 @
cd4d7e6c
...
...
@@ -74,18 +74,21 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
if
(
!
stat
.
isDirectory
())
{
return
Promise
.
reject
(
SHELL_CWD_INVALID_EXIT_CODE
);
}
return
undefined
;
},
async
err
=>
{
if
(
err
&&
err
.
code
===
'
ENOENT
'
)
{
// So we can include in the error message the specified CWD
shellLaunchConfig
.
cwd
=
cwd
;
return
Promise
.
reject
(
SHELL_CWD_INVALID_EXIT_CODE
);
}
return
undefined
;
});
const
executableVerification
=
stat
(
shellLaunchConfig
.
executable
!
).
then
(
async
stat
=>
{
if
(
!
stat
.
isFile
()
&&
!
stat
.
isSymbolicLink
())
{
return
Promise
.
reject
(
stat
.
isDirectory
()
?
SHELL_PATH_DIRECTORY_EXIT_CODE
:
SHELL_PATH_INVALID_EXIT_CODE
);
}
return
undefined
;
},
async
(
err
)
=>
{
if
(
err
&&
err
.
code
===
'
ENOENT
'
)
{
let
cwd
=
shellLaunchConfig
.
cwd
instanceof
URI
?
shellLaunchConfig
.
cwd
.
path
:
shellLaunchConfig
.
cwd
!
;
...
...
@@ -96,6 +99,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
return
Promise
.
reject
(
SHELL_PATH_INVALID_EXIT_CODE
);
}
}
return
undefined
;
});
Promise
.
all
([
cwdVerification
,
executableVerification
]).
then
(()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录