Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6d29f144
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,发现更多精彩内容 >>
提交
6d29f144
编写于
4月 16, 2018
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move preparePathForTerminal to terminalEnvironment
上级
29a45bee
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
45 deletion
+36
-45
src/vs/workbench/parts/terminal/electron-browser/terminalEnvironment.ts
...ch/parts/terminal/electron-browser/terminalEnvironment.ts
+24
-0
src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
...orkbench/parts/terminal/electron-browser/terminalPanel.ts
+2
-25
src/vs/workbench/parts/terminal/test/electron-browser/terminalEnvironment.test.ts
...erminal/test/electron-browser/terminalEnvironment.test.ts
+10
-0
src/vs/workbench/parts/terminal/test/electron-browser/terminalPanel.test.ts
...arts/terminal/test/electron-browser/terminalPanel.test.ts
+0
-20
未找到文件。
src/vs/workbench/parts/terminal/electron-browser/terminalEnvironment.ts
浏览文件 @
6d29f144
...
...
@@ -157,3 +157,27 @@ function _sanitizeCwd(cwd: string): string {
}
return
cwd
;
}
/**
* Adds quotes to a path if it contains whitespaces
*/
export
function
preparePathForTerminal
(
path
:
string
):
string
{
if
(
platform
.
isWindows
)
{
if
(
/
\s
+/
.
test
(
path
))
{
return
`"
${
path
}
"`
;
}
return
path
;
}
path
=
path
.
replace
(
/
(
%5C|
\\)
/g
,
'
\\\\
'
);
const
charsToEscape
=
[
'
'
,
'
\'
'
,
'
"
'
,
'
?
'
,
'
:
'
,
'
;
'
,
'
!
'
,
'
*
'
,
'
(
'
,
'
)
'
,
'
{
'
,
'
}
'
,
'
[
'
,
'
]
'
];
for
(
let
i
=
0
;
i
<
path
.
length
;
i
++
)
{
const
indexOfChar
=
charsToEscape
.
indexOf
(
path
.
charAt
(
i
));
if
(
indexOfChar
>=
0
)
{
path
=
`
${
path
.
substring
(
0
,
i
)}
\
\$
{path.charAt(i)}
${
path
.
substring
(
i
+
1
)}
`
;
i
++
;
// Skip char due to escape char being added
}
}
return
path
;
}
src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
浏览文件 @
6d29f144
...
...
@@ -6,6 +6,7 @@
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
terminalEnvironment
from
'
vs/workbench/parts/terminal/electron-browser/terminalEnvironment
'
;
import
{
Action
,
IAction
}
from
'
vs/base/common/actions
'
;
import
{
IActionItem
,
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
...
...
@@ -288,7 +289,7 @@ export class TerminalPanel extends Panel {
}
const
terminal
=
this
.
_terminalService
.
getActiveInstance
();
terminal
.
sendText
(
TerminalPanel
.
preparePathForTerminal
(
path
),
false
);
terminal
.
sendText
(
terminalEnvironment
.
preparePathForTerminal
(
path
),
false
);
}
}));
}
...
...
@@ -309,30 +310,6 @@ export class TerminalPanel extends Panel {
// dom.toggleClass(this._parentDomElement, 'enable-ligatures', this._terminalService.configHelper.config.fontLigatures);
this
.
layout
(
new
dom
.
Dimension
(
this
.
_parentDomElement
.
offsetWidth
,
this
.
_parentDomElement
.
offsetHeight
));
}
/**
* Adds quotes to a path if it contains whitespaces
*/
public
static
preparePathForTerminal
(
path
:
string
):
string
{
if
(
platform
.
isWindows
)
{
if
(
/
\s
+/
.
test
(
path
))
{
return
`"
${
path
}
"`
;
}
return
path
;
}
path
=
path
.
replace
(
/
(
%5C|
\\)
/g
,
'
\\\\
'
);
const
charsToEscape
=
[
'
'
,
'
\'
'
,
'
"
'
,
'
?
'
,
'
:
'
,
'
;
'
,
'
!
'
,
'
*
'
,
'
(
'
,
'
)
'
,
'
{
'
,
'
}
'
,
'
[
'
,
'
]
'
];
for
(
let
i
=
0
;
i
<
path
.
length
;
i
++
)
{
const
indexOfChar
=
charsToEscape
.
indexOf
(
path
.
charAt
(
i
));
if
(
indexOfChar
>=
0
)
{
path
=
`
${
path
.
substring
(
0
,
i
)}
\
\$
{path.charAt(i)}
${
path
.
substring
(
i
+
1
)}
`
;
i
++
;
// Skip char due to escape char being added
}
}
return
path
;
}
}
registerThemingParticipant
((
theme
:
ITheme
,
collector
:
ICssStyleCollector
)
=>
{
...
...
src/vs/workbench/parts/terminal/test/electron-browser/terminalEnvironment.test.ts
浏览文件 @
6d29f144
...
...
@@ -165,4 +165,14 @@ suite('Workbench - TerminalEnvironment', () => {
assertPathsMatch
(
terminalEnvironment
.
getCwd
({
executable
:
null
,
args
:
[],
ignoreConfigurationCwd
:
true
},
Uri
.
file
(
'
/bar
'
),
configHelper
),
'
/bar
'
);
});
});
test
(
'
preparePathForTerminal
'
,
function
()
{
if
(
platform
.
isWindows
)
{
assert
.
equal
(
terminalEnvironment
.
preparePathForTerminal
(
'
C:
\\
foo
'
),
'
C:
\\
foo
'
);
assert
.
equal
(
terminalEnvironment
.
preparePathForTerminal
(
'
C:
\\
foo bar
'
),
'
"C:
\\
foo bar"
'
);
return
;
}
assert
.
equal
(
terminalEnvironment
.
preparePathForTerminal
(
'
/a/
\\
foo bar"
\'
? ;
\'
?? :
'
),
'
/a/
\\\\
foo
\\
bar
\\
"
\\\'\\
?
\\
\\
;
\\\'\\
?
\\
?
\\
\\
\\
:
'
);
assert
.
equal
(
terminalEnvironment
.
preparePathForTerminal
(
'
/
\\\'
"?:;!*(){}[]
'
),
'
/
\\\\\\\'\\
"
\\
?
\\
:
\\
;
\\
!
\\
*
\\
(
\\
)
\\
{
\\
}
\\
[
\\
]
'
);
});
});
\ No newline at end of file
src/vs/workbench/parts/terminal/test/electron-browser/terminalPanel.test.ts
已删除
100644 → 0
浏览文件 @
29a45bee
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
assert
from
'
assert
'
;
import
{
TerminalPanel
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalPanel
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
suite
(
'
Workbench - TerminalPanel
'
,
()
=>
{
test
(
'
preparePathForTerminal
'
,
function
()
{
if
(
platform
.
isWindows
)
{
assert
.
equal
(
TerminalPanel
.
preparePathForTerminal
(
'
C:
\\
foo
'
),
'
C:
\\
foo
'
);
assert
.
equal
(
TerminalPanel
.
preparePathForTerminal
(
'
C:
\\
foo bar
'
),
'
"C:
\\
foo bar"
'
);
return
;
}
assert
.
equal
(
TerminalPanel
.
preparePathForTerminal
(
'
/a/
\\
foo bar"
\'
? ;
\'
?? :
'
),
'
/a/
\\\\
foo
\\
bar
\\
"
\\\'\\
?
\\
\\
;
\\\'\\
?
\\
?
\\
\\
\\
:
'
);
assert
.
equal
(
TerminalPanel
.
preparePathForTerminal
(
'
/
\\\'
"?:;!*(){}[]
'
),
'
/
\\\\\\\'\\
"
\\
?
\\
:
\\
;
\\
!
\\
*
\\
(
\\
)
\\
{
\\
}
\\
[
\\
]
'
);
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录