Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
157e6c99
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,发现更多精彩内容 >>
提交
157e6c99
编写于
2月 22, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #2066
上级
d2a4a01f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
32 deletion
+41
-32
src/vs/editor/common/controller/oneCursor.ts
src/vs/editor/common/controller/oneCursor.ts
+41
-32
未找到文件。
src/vs/editor/common/controller/oneCursor.ts
浏览文件 @
157e6c99
...
@@ -841,43 +841,52 @@ export class OneCursorOp {
...
@@ -841,43 +841,52 @@ export class OneCursorOp {
// TODO@Alex -> select in editable range
// TODO@Alex -> select in editable range
let
validatedPosition
=
cursor
.
validatePosition
(
position
);
let
validatedPosition
=
cursor
.
validatePosition
(
position
);
let
validatedViewPosition
:
editorCommon
.
IPosition
;
ctx
.
cursorPositionChangeReason
=
'
explicit
'
;
if
(
viewPosition
)
{
ctx
.
shouldRevealHorizontal
=
false
;
validatedViewPosition
=
cursor
.
validateViewPosition
(
viewPosition
.
lineNumber
,
viewPosition
.
column
,
validatedPosition
);
}
else
{
validatedViewPosition
=
cursor
.
convertModelPositionToViewPosition
(
validatedPosition
.
lineNumber
,
validatedPosition
.
column
);
}
let
nextLineViewPosition
:
editorCommon
.
IPosition
;
if
(
validatedViewPosition
.
lineNumber
===
cursor
.
getViewLineCount
())
{
nextLineViewPosition
=
{
lineNumber
:
validatedViewPosition
.
lineNumber
,
column
:
cursor
.
getViewLineMaxColumn
(
validatedViewPosition
.
lineNumber
)
};
}
else
{
nextLineViewPosition
=
{
lineNumber
:
validatedViewPosition
.
lineNumber
+
1
,
column
:
1
};
}
let
viewLineNumber
:
number
,
viewColumn
:
number
;
if
(
!
inSelectionMode
||
!
cursor
.
hasSelection
())
{
if
(
!
inSelectionMode
||
!
cursor
.
hasSelection
())
{
let
viewSelectionStartRange
=
new
Range
(
validatedViewPosition
.
lineNumber
,
1
,
nextLineViewPosition
.
lineNumber
,
nextLineViewPosition
.
column
);
let
nextLinePosition
:
editorCommon
.
IPosition
;
let
r1
=
cursor
.
convertViewToModelPosition
(
viewSelectionStartRange
.
startLineNumber
,
viewSelectionStartRange
.
startColumn
);
if
(
validatedPosition
.
lineNumber
===
cursor
.
model
.
getLineCount
())
{
let
r2
=
cursor
.
convertViewToModelPosition
(
viewSelectionStartRange
.
endLineNumber
,
viewSelectionStartRange
.
endColumn
);
nextLinePosition
=
{
cursor
.
setSelectionStart
(
new
Range
(
r1
.
lineNumber
,
r1
.
column
,
r2
.
lineNumber
,
r2
.
column
),
viewSelectionStartRange
);
lineNumber
:
validatedPosition
.
lineNumber
,
viewLineNumber
=
viewSelectionStartRange
.
endLineNumber
;
column
:
cursor
.
model
.
getLineMaxColumn
(
validatedPosition
.
lineNumber
)
viewColumn
=
viewSelectionStartRange
.
endColumn
;
};
}
else
{
nextLinePosition
=
{
lineNumber
:
validatedPosition
.
lineNumber
+
1
,
column
:
1
};
}
let
selectionStartRange
=
new
Range
(
validatedPosition
.
lineNumber
,
1
,
nextLinePosition
.
lineNumber
,
nextLinePosition
.
column
);
let
r1
=
cursor
.
convertModelPositionToViewPosition
(
validatedPosition
.
lineNumber
,
1
);
let
r2
=
cursor
.
convertModelPositionToViewPosition
(
nextLinePosition
.
lineNumber
,
nextLinePosition
.
column
);
cursor
.
setSelectionStart
(
selectionStartRange
,
new
Range
(
r1
.
lineNumber
,
r1
.
column
,
r2
.
lineNumber
,
r2
.
column
));
cursor
.
moveModelPosition
(
cursor
.
hasSelection
(),
selectionStartRange
.
endLineNumber
,
selectionStartRange
.
endColumn
,
0
,
false
);
return
true
;
}
else
{
}
else
{
viewLineNumber
=
validatedViewPosition
.
lineNumber
;
if
(
validatedPosition
.
lineNumber
!==
cursor
.
getSelectionStart
().
getStartPosition
().
lineNumber
)
{
viewColumn
=
1
;
let
validatedViewPosition
:
editorCommon
.
IPosition
;
if
(
viewPosition
)
{
validatedViewPosition
=
cursor
.
validateViewPosition
(
viewPosition
.
lineNumber
,
viewPosition
.
column
,
validatedPosition
);
}
else
{
validatedViewPosition
=
cursor
.
convertModelPositionToViewPosition
(
validatedPosition
.
lineNumber
,
validatedPosition
.
column
);
}
let
column
=
validatedViewPosition
.
column
;
if
(
validatedViewPosition
.
lineNumber
!==
cursor
.
getViewLineCount
()
||
validatedViewPosition
.
column
!==
cursor
.
getViewLineMaxColumn
(
validatedViewPosition
.
lineNumber
))
{
column
=
1
;
}
cursor
.
moveViewPosition
(
cursor
.
hasSelection
(),
validatedViewPosition
.
lineNumber
,
column
,
0
,
false
);
}
else
{
let
column
=
validatedPosition
.
column
;
if
(
validatedPosition
.
lineNumber
!==
cursor
.
model
.
getLineCount
()
||
validatedPosition
.
column
!==
cursor
.
model
.
getLineMaxColumn
(
validatedPosition
.
lineNumber
))
{
column
=
1
;
}
cursor
.
moveModelPosition
(
cursor
.
hasSelection
(),
validatedPosition
.
lineNumber
,
column
,
0
,
false
);
}
return
true
;
}
}
ctx
.
cursorPositionChangeReason
=
'
explicit
'
;
ctx
.
shouldRevealHorizontal
=
false
;
cursor
.
moveViewPosition
(
cursor
.
hasSelection
(),
viewLineNumber
,
viewColumn
,
0
,
false
);
return
true
;
}
}
public
static
word
(
cursor
:
OneCursor
,
inSelectionMode
:
boolean
,
position
:
editorCommon
.
IPosition
,
preference
:
string
,
ctx
:
IOneCursorOperationContext
):
boolean
{
public
static
word
(
cursor
:
OneCursor
,
inSelectionMode
:
boolean
,
position
:
editorCommon
.
IPosition
,
preference
:
string
,
ctx
:
IOneCursorOperationContext
):
boolean
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录