Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2cdf977a
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,发现更多精彩内容 >>
提交
2cdf977a
编写于
1月 13, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add edit stack element before and after accepting a completion
上级
008867f0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
10 deletion
+25
-10
src/vs/editor/contrib/snippet/common/snippet.ts
src/vs/editor/contrib/snippet/common/snippet.ts
+25
-10
未找到文件。
src/vs/editor/contrib/snippet/common/snippet.ts
浏览文件 @
2cdf977a
...
@@ -775,18 +775,29 @@ class SnippetController implements ISnippetController {
...
@@ -775,18 +775,29 @@ class SnippetController implements ISnippetController {
return
snippet
.
bind
(
model
.
getLineContent
(
typeRange
.
startLineNumber
),
typeRange
.
startLineNumber
-
1
,
typeRange
.
startColumn
-
1
,
editor
);
return
snippet
.
bind
(
model
.
getLineContent
(
typeRange
.
startLineNumber
),
typeRange
.
startLineNumber
-
1
,
typeRange
.
startColumn
-
1
,
editor
);
}
}
private
static
_getCommandForSnippet
(
adaptedSnippet
:
ICodeSnippet
,
typeRange
:
EditorCommon
.
IEditorRange
):
EditorCommon
.
IIdentifiedSingleEditOperation
{
private
static
_addCommandForSnippet
(
model
:
EditorCommon
.
ITextModel
,
adaptedSnippet
:
ICodeSnippet
,
typeRange
:
EditorCommon
.
IEditorRange
,
out
:
EditorCommon
.
IIdentifiedSingleEditOperation
[]):
void
{
var
insertText
=
adaptedSnippet
.
lines
.
join
(
'
\n
'
);
let
insertText
=
adaptedSnippet
.
lines
.
join
(
'
\n
'
);
return
EditOperation
.
replaceMove
(
typeRange
,
insertText
);
let
currentText
=
model
.
getValueInRange
(
typeRange
,
EditorCommon
.
EndOfLinePreference
.
LF
);
if
(
insertText
!==
currentText
)
{
out
.
push
(
EditOperation
.
replaceMove
(
typeRange
,
insertText
));
}
}
}
private
_runForPrimarySelection
(
snippet
:
CodeSnippet
,
overwriteBefore
:
number
,
overwriteAfter
:
number
):
void
{
private
_runForPrimarySelection
(
snippet
:
CodeSnippet
,
overwriteBefore
:
number
,
overwriteAfter
:
number
):
void
{
var
initialAlternativeVersionId
=
this
.
_editor
.
getModel
().
getAlternativeVersionId
();
let
initialAlternativeVersionId
=
this
.
_editor
.
getModel
().
getAlternativeVersionId
();
let
edits
:
EditorCommon
.
IIdentifiedSingleEditOperation
[]
=
[];
var
prepared
=
SnippetController
.
_prepareSnippet
(
this
.
_editor
,
this
.
_editor
.
getSelection
(),
snippet
,
overwriteBefore
,
overwriteAfter
);
let
prepared
=
SnippetController
.
_prepareSnippet
(
this
.
_editor
,
this
.
_editor
.
getSelection
(),
snippet
,
overwriteBefore
,
overwriteAfter
);
this
.
_editor
.
executeEdits
(
'
editor.contrib.insertSnippetHelper
'
,
[
SnippetController
.
_getCommandForSnippet
(
prepared
.
adaptedSnippet
,
prepared
.
typeRange
)]
);
SnippetController
.
_addCommandForSnippet
(
this
.
_editor
.
getModel
(),
prepared
.
adaptedSnippet
,
prepared
.
typeRange
,
edits
);
var
cursorOnly
=
SnippetController
.
_getSnippetCursorOnly
(
prepared
.
adaptedSnippet
);
if
(
edits
.
length
>
0
)
{
this
.
_editor
.
getModel
().
pushStackElement
();
this
.
_editor
.
executeEdits
(
'
editor.contrib.insertSnippetHelper
'
,
edits
);
this
.
_editor
.
getModel
().
pushStackElement
();
}
let
cursorOnly
=
SnippetController
.
_getSnippetCursorOnly
(
prepared
.
adaptedSnippet
);
if
(
cursorOnly
)
{
if
(
cursorOnly
)
{
this
.
_editor
.
setSelection
(
Selection
.
createSelection
(
cursorOnly
.
lineNumber
,
cursorOnly
.
column
,
cursorOnly
.
lineNumber
,
cursorOnly
.
column
));
this
.
_editor
.
setSelection
(
Selection
.
createSelection
(
cursorOnly
.
lineNumber
,
cursorOnly
.
column
,
cursorOnly
.
lineNumber
,
cursorOnly
.
column
));
}
else
if
(
prepared
.
adaptedSnippet
.
placeHolders
.
length
>
0
)
{
}
else
if
(
prepared
.
adaptedSnippet
.
placeHolders
.
length
>
0
)
{
...
@@ -802,11 +813,15 @@ class SnippetController implements ISnippetController {
...
@@ -802,11 +813,15 @@ class SnippetController implements ISnippetController {
edits
:
EditorCommon
.
IIdentifiedSingleEditOperation
[]
=
[];
edits
:
EditorCommon
.
IIdentifiedSingleEditOperation
[]
=
[];
for
(
let
i
=
0
;
i
<
selections
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
selections
.
length
;
i
++
)
{
var
prepared
=
SnippetController
.
_prepareSnippet
(
this
.
_editor
,
selections
[
i
],
snippet
,
overwriteBefore
,
overwriteAfter
);
let
prepared
=
SnippetController
.
_prepareSnippet
(
this
.
_editor
,
selections
[
i
],
snippet
,
overwriteBefore
,
overwriteAfter
);
edits
.
push
(
SnippetController
.
_getCommandForSnippet
(
prepared
.
adaptedSnippet
,
prepared
.
typeRange
)
);
SnippetController
.
_addCommandForSnippet
(
this
.
_editor
.
getModel
(),
prepared
.
adaptedSnippet
,
prepared
.
typeRange
,
edits
);
}
}
this
.
_editor
.
executeEdits
(
'
editor.contrib.insertSnippetHelper
'
,
edits
);
if
(
edits
.
length
>
0
)
{
this
.
_editor
.
getModel
().
pushStackElement
();
this
.
_editor
.
executeEdits
(
'
editor.contrib.insertSnippetHelper
'
,
edits
);
this
.
_editor
.
getModel
().
pushStackElement
();
}
}
}
private
static
_prepareSnippet
(
editor
:
EditorCommon
.
ICommonCodeEditor
,
selection
:
EditorCommon
.
IEditorSelection
,
snippet
:
CodeSnippet
,
overwriteBefore
:
number
,
overwriteAfter
:
number
):
{
typeRange
:
EditorCommon
.
IEditorRange
;
adaptedSnippet
:
ICodeSnippet
;
}
{
private
static
_prepareSnippet
(
editor
:
EditorCommon
.
ICommonCodeEditor
,
selection
:
EditorCommon
.
IEditorSelection
,
snippet
:
CodeSnippet
,
overwriteBefore
:
number
,
overwriteAfter
:
number
):
{
typeRange
:
EditorCommon
.
IEditorRange
;
adaptedSnippet
:
ICodeSnippet
;
}
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录