Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
0dcc8e4d
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,发现更多精彩内容 >>
提交
0dcc8e4d
编写于
11月 09, 2018
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
inPlaceReplace strict null checks.
上级
b4aafa6a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
9 deletion
+18
-9
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+1
-0
src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
+17
-9
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
0dcc8e4d
...
...
@@ -329,6 +329,7 @@
"./vs/editor/contrib/hover/hoverOperation.ts"
,
"./vs/editor/contrib/hover/hoverWidgets.ts"
,
"./vs/editor/contrib/hover/modesGlyphHover.ts"
,
"./vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts"
,
"./vs/editor/contrib/inPlaceReplace/inPlaceReplaceCommand.ts"
,
"./vs/editor/contrib/indentation/indentation.ts"
,
"./vs/editor/contrib/indentation/indentUtils.ts"
,
...
...
src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
浏览文件 @
0dcc8e4d
...
...
@@ -37,7 +37,7 @@ class InPlaceReplaceController implements IEditorContribution {
private
readonly
editor
:
ICodeEditor
;
private
readonly
editorWorkerService
:
IEditorWorkerService
;
private
decorationIds
:
string
[]
=
[];
private
currentRequest
:
CancelablePromise
<
IInplaceReplaceSupportResult
>
;
private
currentRequest
:
CancelablePromise
<
IInplaceReplaceSupportResult
|
null
>
;
private
decorationRemover
:
CancelablePromise
<
void
>
;
constructor
(
...
...
@@ -63,21 +63,29 @@ class InPlaceReplaceController implements IEditorContribution {
}
let
selection
=
this
.
editor
.
getSelection
();
if
(
selection
===
null
)
{
return
Promise
.
resolve
(
void
0
);
}
const
model
=
this
.
editor
.
getModel
();
if
(
!
model
)
{
return
Promise
.
resolve
(
void
0
);
}
const
modelURI
=
model
.
uri
;
if
(
selection
.
startLineNumber
!==
selection
.
endLineNumber
)
{
// Can't accept multiline selection
return
null
;
return
Promise
.
resolve
(
void
0
)
;
}
const
state
=
new
EditorState
(
this
.
editor
,
CodeEditorStateFlag
.
Value
|
CodeEditorStateFlag
.
Position
);
if
(
!
this
.
editorWorkerService
.
canNavigateValueSet
(
modelURI
))
{
return
undefined
;
return
Promise
.
resolve
(
void
0
)
;
}
this
.
currentRequest
=
createCancelablePromise
(
token
=>
this
.
editorWorkerService
.
navigateValueSet
(
modelURI
,
selection
,
up
));
this
.
currentRequest
=
createCancelablePromise
(
token
=>
this
.
editorWorkerService
.
navigateValueSet
(
modelURI
,
selection
!
,
up
));
return
this
.
currentRequest
.
then
(
result
=>
{
...
...
@@ -94,7 +102,7 @@ class InPlaceReplaceController implements IEditorContribution {
// Selection
let
editRange
=
Range
.
lift
(
result
.
range
);
let
highlightRange
=
result
.
range
;
let
diff
=
result
.
value
.
length
-
(
selection
.
endColumn
-
selection
.
startColumn
);
let
diff
=
result
.
value
.
length
-
(
selection
!
.
endColumn
-
selection
!
.
startColumn
);
// highlight
highlightRange
=
{
...
...
@@ -104,11 +112,11 @@ class InPlaceReplaceController implements IEditorContribution {
endColumn
:
highlightRange
.
startColumn
+
result
.
value
.
length
};
if
(
diff
>
1
)
{
selection
=
new
Selection
(
selection
.
startLineNumber
,
selection
.
startColumn
,
selection
.
endLineNumber
,
selection
.
endColumn
+
diff
-
1
);
selection
=
new
Selection
(
selection
!
.
startLineNumber
,
selection
!
.
startColumn
,
selection
!
.
endLineNumber
,
selection
!
.
endColumn
+
diff
-
1
);
}
// Insert new text
const
command
=
new
InPlaceReplaceCommand
(
editRange
,
selection
,
result
.
value
);
const
command
=
new
InPlaceReplaceCommand
(
editRange
,
selection
!
,
result
.
value
);
this
.
editor
.
pushUndoStop
();
this
.
editor
.
executeCommand
(
source
,
command
);
...
...
@@ -150,7 +158,7 @@ class InPlaceReplaceUp extends EditorAction {
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
):
Promise
<
void
>
{
let
controller
=
InPlaceReplaceController
.
get
(
editor
);
if
(
!
controller
)
{
return
undefined
;
return
Promise
.
resolve
(
void
0
)
;
}
return
controller
.
run
(
this
.
id
,
true
);
}
...
...
@@ -175,7 +183,7 @@ class InPlaceReplaceDown extends EditorAction {
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
):
Promise
<
void
>
{
let
controller
=
InPlaceReplaceController
.
get
(
editor
);
if
(
!
controller
)
{
return
undefined
;
return
Promise
.
resolve
(
void
0
)
;
}
return
controller
.
run
(
this
.
id
,
false
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录