Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
fa1fb02b
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,发现更多精彩内容 >>
提交
fa1fb02b
编写于
8月 22, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #79454
上级
d98eb32b
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
13 addition
and
4 deletion
+13
-4
build/gulpfile.hygiene.js
build/gulpfile.hygiene.js
+1
-1
src/vs/base/test/node/keytar.test.ts
src/vs/base/test/node/keytar.test.ts
+1
-1
src/vs/workbench/browser/web.simpleservices.ts
src/vs/workbench/browser/web.simpleservices.ts
+0
-1
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+4
-0
src/vs/workbench/contrib/tasks/common/tasks.ts
src/vs/workbench/contrib/tasks/common/tasks.ts
+1
-0
src/vs/workbench/contrib/terminal/common/terminal.ts
src/vs/workbench/contrib/terminal/common/terminal.ts
+4
-0
src/vs/workbench/contrib/terminal/common/terminalService.ts
src/vs/workbench/contrib/terminal/common/terminalService.ts
+2
-0
src/vs/workbench/services/keybinding/browser/keybindingService.ts
...orkbench/services/keybinding/browser/keybindingService.ts
+0
-1
未找到文件。
build/gulpfile.hygiene.js
浏览文件 @
fa1fb02b
...
...
@@ -199,7 +199,7 @@ gulp.task('tslint', () => {
.
pipe
(
filter
(
tslintExtensionsFilter
))
.
pipe
(
gulptslint
.
default
({
rulesDirectory
:
'
build/lib/tslint
'
}))
.
pipe
(
gulptslint
.
default
.
report
({
emitError
:
true
}))
]);
])
.
pipe
(
es
.
through
())
;
});
function
hygiene
(
some
)
{
...
...
src/vs/base/test/node/keytar.test.ts
浏览文件 @
fa1fb02b
...
...
@@ -32,4 +32,4 @@ suite('Keytar', () => {
}
})().
then
(
done
,
done
);
});
});
\ No newline at end of file
});
src/vs/workbench/browser/web.simpleservices.ts
浏览文件 @
fa1fb02b
...
...
@@ -20,7 +20,6 @@ import { IRecentlyOpened, IRecent, isRecentFile, isRecentFolder } from 'vs/platf
import
{
ISerializableCommandAction
}
from
'
vs/platform/actions/common/actions
'
;
import
{
IWorkspaceEditingService
}
from
'
vs/workbench/services/workspace/common/workspaceEditing
'
;
import
{
ITunnelService
}
from
'
vs/platform/remote/common/tunnel
'
;
// tslint:disable-next-line: import-patterns
import
{
IWorkspaceContextService
,
WorkbenchState
,
IWorkspace
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
addDisposableListener
,
EventType
,
windowOpenNoOpener
}
from
'
vs/base/browser/dom
'
;
import
{
IEditorService
,
IResourceEditor
}
from
'
vs/workbench/services/editor/common/editorService
'
;
...
...
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
浏览文件 @
fa1fb02b
...
...
@@ -339,6 +339,7 @@ export class TerminalTaskSystem implements ITaskSystem {
private
async
executeTask
(
task
:
Task
,
resolver
:
ITaskResolver
,
trigger
:
string
):
Promise
<
ITaskSummary
>
{
let
promises
:
Promise
<
ITaskSummary
>
[]
=
[];
if
(
task
.
configurationProperties
.
dependsOn
)
{
// tslint:disable-next-line: no-for-in-array
for
(
let
index
in
task
.
configurationProperties
.
dependsOn
)
{
const
dependency
=
task
.
configurationProperties
.
dependsOn
[
index
];
let
dependencyTask
=
resolver
.
resolve
(
dependency
.
workspaceFolder
,
dependency
.
task
!
);
...
...
@@ -1375,6 +1376,7 @@ export class TerminalTaskSystem implements ITaskSystem {
return
command
;
}
if
(
cwd
===
undefined
)
{
// tslint:disable-next-line: no-nodejs-globals
cwd
=
process
.
cwd
();
}
const
dir
=
path
.
dirname
(
command
);
...
...
@@ -1383,7 +1385,9 @@ export class TerminalTaskSystem implements ITaskSystem {
// to the current working directory.
return
path
.
join
(
cwd
,
command
);
}
// tslint:disable-next-line: no-nodejs-globals
if
(
paths
===
undefined
&&
Types
.
isString
(
process
.
env
.
PATH
))
{
// tslint:disable-next-line: no-nodejs-globals
paths
=
process
.
env
.
PATH
.
split
(
path
.
delimiter
);
}
// No PATH environment. Make path absolute to the cwd.
...
...
src/vs/workbench/contrib/tasks/common/tasks.ts
浏览文件 @
fa1fb02b
...
...
@@ -985,6 +985,7 @@ export namespace KeyedTaskIdentifier {
function
sortedStringify
(
literal
:
any
):
string
{
const
keys
=
Object
.
keys
(
literal
).
sort
();
let
result
:
string
=
''
;
// tslint:disable-next-line: no-for-in-array
for
(
let
position
in
keys
)
{
let
stringified
=
literal
[
keys
[
position
]];
if
(
stringified
instanceof
Object
)
{
...
...
src/vs/workbench/contrib/terminal/common/terminal.ts
浏览文件 @
fa1fb02b
...
...
@@ -248,6 +248,7 @@ export interface ITerminalService {
/**
* Creates a raw terminal instance, this should not be used outside of the terminal part.
*/
// tslint:disable-next-line: no-dom-globals
createInstance
(
container
:
HTMLElement
|
undefined
,
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
;
getInstanceFromId
(
terminalId
:
number
):
ITerminalInstance
|
undefined
;
getInstanceFromIndex
(
terminalIndex
:
number
):
ITerminalInstance
;
...
...
@@ -279,6 +280,7 @@ export interface ITerminalService {
selectDefaultWindowsShell
():
Promise
<
void
>
;
// tslint:disable-next-line: no-dom-globals
setContainers
(
panelContainer
:
HTMLElement
,
terminalContainer
:
HTMLElement
):
void
;
manageWorkspaceShellPermissions
():
void
;
...
...
@@ -337,6 +339,7 @@ export interface ITerminalTab {
focusNextPane
():
void
;
resizePane
(
direction
:
Direction
):
void
;
setActiveInstanceByIndex
(
index
:
number
):
void
;
// tslint:disable-next-line: no-dom-globals
attachToElement
(
element
:
HTMLElement
):
void
;
setVisible
(
visible
:
boolean
):
void
;
layout
(
width
:
number
,
height
:
number
):
void
;
...
...
@@ -611,6 +614,7 @@ export interface ITerminalInstance {
*
* @param container The element to attach the terminal instance to.
*/
// tslint:disable-next-line: no-dom-globals
attachToElement
(
container
:
HTMLElement
):
void
;
/**
...
...
src/vs/workbench/contrib/terminal/common/terminalService.ts
浏览文件 @
fa1fb02b
...
...
@@ -122,7 +122,9 @@ export abstract class TerminalService implements ITerminalService {
protected
abstract
_showBackgroundTerminal
(
instance
:
ITerminalInstance
):
void
;
public
abstract
createTerminal
(
shell
?:
IShellLaunchConfig
,
wasNewTerminalAction
?:
boolean
):
ITerminalInstance
;
// tslint:disable-next-line: no-dom-globals
public
abstract
createInstance
(
container
:
HTMLElement
,
shellLaunchConfig
:
IShellLaunchConfig
):
ITerminalInstance
;
// tslint:disable-next-line: no-dom-globals
public
abstract
setContainers
(
panelContainer
:
HTMLElement
,
terminalContainer
:
HTMLElement
):
void
;
public
getActiveOrCreateInstance
(
wasNewTerminalAction
?:
boolean
):
ITerminalInstance
{
...
...
src/vs/workbench/services/keybinding/browser/keybindingService.ts
浏览文件 @
fa1fb02b
...
...
@@ -34,7 +34,6 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
import
{
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
{
MenuRegistry
}
from
'
vs/platform/actions/common/actions
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
// tslint:disable-next-line: import-patterns
import
{
commandsExtensionPoint
}
from
'
vs/workbench/api/common/menusExtensionPoint
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
RunOnceScheduler
}
from
'
vs/base/common/async
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录