Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6d75a741
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,发现更多精彩内容 >>
提交
6d75a741
编写于
9月 17, 2018
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/Microsoft/vscode
上级
7b15a622
2fe21eca
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
47 addition
and
5 deletion
+47
-5
src/vs/editor/contrib/snippet/snippetParser.ts
src/vs/editor/contrib/snippet/snippetParser.ts
+7
-1
src/vs/editor/contrib/snippet/test/snippetParser.test.ts
src/vs/editor/contrib/snippet/test/snippetParser.test.ts
+26
-0
src/vs/platform/windows/electron-main/windowsService.ts
src/vs/platform/windows/electron-main/windowsService.ts
+14
-4
未找到文件。
src/vs/editor/contrib/snippet/snippetParser.ts
浏览文件 @
6d75a741
...
...
@@ -158,7 +158,13 @@ export abstract class Marker {
const
newChildren
=
parent
.
children
.
slice
(
0
);
newChildren
.
splice
(
idx
,
1
,
...
others
);
parent
.
_children
=
newChildren
;
others
.
forEach
(
node
=>
node
.
parent
=
parent
);
(
function
_fixParent
(
children
:
Marker
[],
parent
:
Marker
)
{
for
(
const
child
of
children
)
{
child
.
parent
=
parent
;
_fixParent
(
child
.
children
,
child
);
}
})(
others
,
parent
);
}
get
children
():
Marker
[]
{
...
...
src/vs/editor/contrib/snippet/test/snippetParser.test.ts
浏览文件 @
6d75a741
...
...
@@ -723,4 +723,30 @@ suite('SnippetParser', () => {
test
(
'
snippets variable not resolved in JSON proposal #52931
'
,
function
()
{
assertTextAndMarker
(
'
FOO${1:/bin/bash}
'
,
'
FOO/bin/bash
'
,
Text
,
Placeholder
);
});
test
(
'
Mirroring sequence of nested placeholders not selected properly on backjumping #58736
'
,
function
()
{
let
snippet
=
new
SnippetParser
().
parse
(
'
${3:nest1 ${1:nest2 ${2:nest3}}} $3
'
);
assert
.
equal
(
snippet
.
children
.
length
,
3
);
assert
.
ok
(
snippet
.
children
[
0
]
instanceof
Placeholder
);
assert
.
ok
(
snippet
.
children
[
1
]
instanceof
Text
);
assert
.
ok
(
snippet
.
children
[
2
]
instanceof
Placeholder
);
function
assertParent
(
marker
:
Marker
)
{
marker
.
children
.
forEach
(
assertParent
);
if
(
!
(
marker
instanceof
Placeholder
))
{
return
;
}
let
found
=
false
;
let
m
:
Marker
=
marker
;
while
(
m
&&
!
found
)
{
if
(
m
.
parent
===
snippet
)
{
found
=
true
;
}
m
=
m
.
parent
;
}
assert
.
ok
(
found
);
}
let
[,
,
clone
]
=
snippet
.
children
;
assertParent
(
clone
);
});
});
src/vs/platform/windows/electron-main/windowsService.ts
浏览文件 @
6d75a741
...
...
@@ -23,7 +23,7 @@ import { IWorkspaceIdentifier, IWorkspaceFolderCreationData, ISingleFolderWorksp
import
{
ISerializableCommandAction
}
from
'
vs/platform/actions/common/actions
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
mnemonicButtonLabel
}
from
'
vs/base/common/labels
'
;
import
{
isMacintosh
}
from
'
vs/base/common/platform
'
;
import
{
isMacintosh
,
isLinux
}
from
'
vs/base/common/platform
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
export
class
WindowsService
implements
IWindowsService
,
IURLHandler
,
IDisposable
{
...
...
@@ -522,15 +522,25 @@ export class WindowsService implements IWindowsService, IURLHandler, IDisposable
process
.
arch
);
const
ok
=
nls
.
localize
(
'
okButton
'
,
"
OK
"
);
const
copy
=
mnemonicButtonLabel
(
nls
.
localize
({
key
:
'
copy
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Copy
"
));
let
buttons
:
string
[];
if
(
isLinux
)
{
buttons
=
[
copy
,
ok
];
}
else
{
buttons
=
[
ok
,
copy
];
}
this
.
windowsMainService
.
showMessageBox
({
title
:
product
.
nameLong
,
type
:
'
info
'
,
message
:
product
.
nameLong
,
detail
:
`\n
${
detail
}
`
,
buttons
:
[
nls
.
localize
(
'
okButton
'
,
"
OK
"
),
mnemonicButtonLabel
(
nls
.
localize
({
key
:
'
copy
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Copy
"
))],
noLink
:
true
buttons
,
noLink
:
true
,
defaultId
:
buttons
.
indexOf
(
ok
)
},
lastActiveWindow
).
then
(
result
=>
{
if
(
result
.
button
===
1
)
{
if
(
buttons
[
result
.
button
]
===
copy
)
{
clipboard
.
writeText
(
detail
);
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录