Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
65265073
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,发现更多精彩内容 >>
提交
65265073
编写于
5月 27, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
remove unused kind-property from SelectionRange
上级
a1a7af52
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
14 addition
and
19 deletion
+14
-19
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+0
-1
src/vs/editor/contrib/smartSelect/bracketSelections.ts
src/vs/editor/contrib/smartSelect/bracketSelections.ts
+6
-6
src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
+3
-3
src/vs/editor/contrib/smartSelect/wordSelections.ts
src/vs/editor/contrib/smartSelect/wordSelections.ts
+4
-4
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+0
-1
src/vs/workbench/api/common/extHostTypeConverters.ts
src/vs/workbench/api/common/extHostTypeConverters.ts
+1
-4
未找到文件。
src/vs/editor/common/modes.ts
浏览文件 @
65265073
...
...
@@ -1094,7 +1094,6 @@ export interface DocumentColorProvider {
}
export
interface
SelectionRange
{
kind
:
string
;
range
:
IRange
;
}
...
...
src/vs/editor/contrib/smartSelect/bracketSelections.ts
浏览文件 @
65265073
...
...
@@ -115,8 +115,8 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
}
const
innerBracket
=
Range
.
fromPositions
(
bracket
.
range
.
getEndPosition
(),
closing
!
.
getStartPosition
());
const
outerBracket
=
Range
.
fromPositions
(
bracket
.
range
.
getStartPosition
(),
closing
!
.
getEndPosition
());
bucket
.
push
({
range
:
innerBracket
,
kind
:
'
statement.brackets
'
});
bucket
.
push
({
range
:
outerBracket
,
kind
:
'
statement.brackets.full
'
});
bucket
.
push
({
range
:
innerBracket
});
bucket
.
push
({
range
:
outerBracket
});
BracketSelectionRangeProvider
.
_addBracketLeading
(
model
,
outerBracket
,
bucket
);
}
}
...
...
@@ -135,8 +135,8 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
const
startLine
=
bracket
.
startLineNumber
;
const
column
=
model
.
getLineFirstNonWhitespaceColumn
(
startLine
);
if
(
column
!==
0
&&
column
!==
bracket
.
startColumn
)
{
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
startLine
,
column
),
bracket
.
getEndPosition
())
,
kind
:
'
statement.brackets.leading
'
});
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
startLine
,
1
),
bracket
.
getEndPosition
())
,
kind
:
'
statement.brackets.leading.full
'
});
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
startLine
,
column
),
bracket
.
getEndPosition
())
});
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
startLine
,
1
),
bracket
.
getEndPosition
())
});
}
// xxxxxxxx
...
...
@@ -147,8 +147,8 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
if
(
aboveLine
>
0
)
{
const
column
=
model
.
getLineFirstNonWhitespaceColumn
(
aboveLine
);
if
(
column
===
bracket
.
startColumn
&&
column
!==
model
.
getLineLastNonWhitespaceColumn
(
aboveLine
))
{
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
aboveLine
,
column
),
bracket
.
getEndPosition
())
,
kind
:
'
statement.brackets.leading
'
});
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
aboveLine
,
1
),
bracket
.
getEndPosition
())
,
kind
:
'
statement.brackets.leading.full
'
});
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
aboveLine
,
column
),
bracket
.
getEndPosition
())
});
bucket
.
push
({
range
:
Range
.
fromPositions
(
new
Position
(
aboveLine
,
1
),
bracket
.
getEndPosition
())
});
}
}
}
...
...
src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
浏览文件 @
65265073
...
...
@@ -326,9 +326,9 @@ suite('SmartSelect', () => {
const
reg
=
SelectionRangeRegistry
.
register
(
'
*
'
,
{
provideSelectionRanges
()
{
return
[[
{
range
:
{
startLineNumber
:
1
,
startColumn
:
10
,
endLineNumber
:
1
,
endColumn
:
11
}
,
kind
:
'
somekind
'
},
{
range
:
{
startLineNumber
:
1
,
startColumn
:
10
,
endLineNumber
:
3
,
endColumn
:
2
}
,
kind
:
'
somekind
'
},
{
range
:
{
startLineNumber
:
1
,
startColumn
:
1
,
endLineNumber
:
3
,
endColumn
:
2
}
,
kind
:
'
somekind
'
},
{
range
:
{
startLineNumber
:
1
,
startColumn
:
10
,
endLineNumber
:
1
,
endColumn
:
11
}
},
{
range
:
{
startLineNumber
:
1
,
startColumn
:
10
,
endLineNumber
:
3
,
endColumn
:
2
}
},
{
range
:
{
startLineNumber
:
1
,
startColumn
:
1
,
endLineNumber
:
3
,
endColumn
:
2
}
},
]];
}
});
...
...
src/vs/editor/contrib/smartSelect/wordSelections.ts
浏览文件 @
65265073
...
...
@@ -20,7 +20,7 @@ export class WordSelectionRangeProvider implements SelectionRangeProvider {
this
.
_addInWordRanges
(
bucket
,
model
,
position
);
this
.
_addWordRanges
(
bucket
,
model
,
position
);
this
.
_addWhitespaceLine
(
bucket
,
model
,
position
);
bucket
.
push
({
range
:
model
.
getFullModelRange
()
,
kind
:
'
statement.all
'
});
bucket
.
push
({
range
:
model
.
getFullModelRange
()
});
}
return
result
;
}
...
...
@@ -65,14 +65,14 @@ export class WordSelectionRangeProvider implements SelectionRangeProvider {
}
if
(
start
<
end
)
{
bucket
.
push
({
range
:
new
Range
(
pos
.
lineNumber
,
startColumn
+
start
,
pos
.
lineNumber
,
startColumn
+
end
)
,
kind
:
'
statement.word.part
'
});
bucket
.
push
({
range
:
new
Range
(
pos
.
lineNumber
,
startColumn
+
start
,
pos
.
lineNumber
,
startColumn
+
end
)
});
}
}
private
_addWordRanges
(
bucket
:
SelectionRange
[],
model
:
ITextModel
,
pos
:
Position
):
void
{
const
word
=
model
.
getWordAtPosition
(
pos
);
if
(
word
)
{
bucket
.
push
({
range
:
new
Range
(
pos
.
lineNumber
,
word
.
startColumn
,
pos
.
lineNumber
,
word
.
endColumn
)
,
kind
:
'
statement.word
'
});
bucket
.
push
({
range
:
new
Range
(
pos
.
lineNumber
,
word
.
startColumn
,
pos
.
lineNumber
,
word
.
endColumn
)
});
}
}
...
...
@@ -81,7 +81,7 @@ export class WordSelectionRangeProvider implements SelectionRangeProvider {
&&
model
.
getLineFirstNonWhitespaceColumn
(
pos
.
lineNumber
)
===
0
&&
model
.
getLineLastNonWhitespaceColumn
(
pos
.
lineNumber
)
===
0
)
{
bucket
.
push
({
range
:
new
Range
(
pos
.
lineNumber
,
1
,
pos
.
lineNumber
,
model
.
getLineMaxColumn
(
pos
.
lineNumber
))
,
kind
:
'
statement.line
'
});
bucket
.
push
({
range
:
new
Range
(
pos
.
lineNumber
,
1
,
pos
.
lineNumber
,
model
.
getLineMaxColumn
(
pos
.
lineNumber
))
});
}
}
}
src/vs/monaco.d.ts
浏览文件 @
65265073
...
...
@@ -5343,7 +5343,6 @@ declare namespace monaco.languages {
}
export
interface
SelectionRange
{
kind
:
string
;
range
:
IRange
;
}
...
...
src/vs/workbench/api/common/extHostTypeConverters.ts
浏览文件 @
65265073
...
...
@@ -859,10 +859,7 @@ export namespace Color {
export
namespace
SelectionRange
{
export
function
from
(
obj
:
vscode
.
SelectionRange
):
modes
.
SelectionRange
{
return
{
kind
:
''
,
range
:
Range
.
from
(
obj
.
range
)
};
return
{
range
:
Range
.
from
(
obj
.
range
)
};
}
export
function
to
(
obj
:
modes
.
SelectionRange
):
vscode
.
SelectionRange
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录