Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1e5a5727
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,发现更多精彩内容 >>
提交
1e5a5727
编写于
10月 03, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removing or marking unused parameters
上级
e8475ad5
变更
6
展开全部
隐藏空白更改
内联
并排
Showing
6 changed file
with
245 addition
and
250 deletion
+245
-250
src/vs/base/common/actions.ts
src/vs/base/common/actions.ts
+1
-1
src/vs/editor/common/viewModel/splitLinesCollection.ts
src/vs/editor/common/viewModel/splitLinesCollection.ts
+30
-30
src/vs/editor/contrib/find/findWidget.ts
src/vs/editor/contrib/find/findWidget.ts
+9
-11
src/vs/editor/contrib/folding/folding.ts
src/vs/editor/contrib/folding/folding.ts
+14
-14
src/vs/workbench/electron-browser/actions.ts
src/vs/workbench/electron-browser/actions.ts
+27
-30
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+164
-164
未找到文件。
src/vs/base/common/actions.ts
浏览文件 @
1e5a5727
...
...
@@ -164,7 +164,7 @@ export class Action implements IAction {
}
}
run
(
event
?:
any
,
data
?:
ITelemetryData
):
Thenable
<
any
>
{
run
(
event
?:
any
,
_
data
?:
ITelemetryData
):
Thenable
<
any
>
{
if
(
this
.
_actionCallback
!==
void
0
)
{
return
this
.
_actionCallback
(
event
);
}
...
...
src/vs/editor/common/viewModel/splitLinesCollection.ts
浏览文件 @
1e5a5727
...
...
@@ -340,7 +340,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
return
true
;
}
public
modelPositionIsVisible
(
modelLineNumber
:
number
,
modelColumn
:
number
):
boolean
{
public
modelPositionIsVisible
(
modelLineNumber
:
number
,
_
modelColumn
:
number
):
boolean
{
if
(
modelLineNumber
<
1
||
modelLineNumber
>
this
.
lines
.
length
)
{
// invalid arguments
return
false
;
...
...
@@ -393,7 +393,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
return
new
viewEvents
.
ViewLinesDeletedEvent
(
outputFromLineNumber
,
outputToLineNumber
);
}
public
onModelLinesInserted
(
versionId
:
number
,
fromLineNumber
:
number
,
toLineNumber
:
number
,
text
:
string
[]):
viewEvents
.
ViewLinesInsertedEvent
{
public
onModelLinesInserted
(
versionId
:
number
,
fromLineNumber
:
number
,
_
toLineNumber
:
number
,
text
:
string
[]):
viewEvents
.
ViewLinesInsertedEvent
{
if
(
versionId
<=
this
.
_validModelVersionId
)
{
// Here we check for versionId in case the lines were reconstructed in the meantime.
// We don't want to apply stale change events on top of a newer read model state.
...
...
@@ -894,23 +894,23 @@ class VisibleIdentitySplitLine implements ISplitLine {
return
1
;
}
public
getViewLineContent
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
string
{
public
getViewLineContent
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
string
{
return
model
.
getLineContent
(
modelLineNumber
);
}
public
getViewLineLength
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
public
getViewLineLength
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
number
{
return
model
.
getLineLength
(
modelLineNumber
);
}
public
getViewLineMinColumn
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
public
getViewLineMinColumn
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
number
{
return
model
.
getLineMinColumn
(
modelLineNumber
);
}
public
getViewLineMaxColumn
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
public
getViewLineMaxColumn
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
number
{
return
model
.
getLineMaxColumn
(
modelLineNumber
);
}
public
getViewLineData
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
ViewLineData
{
public
getViewLineData
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
ViewLineData
{
let
lineTokens
=
model
.
getLineTokens
(
modelLineNumber
);
let
lineContent
=
lineTokens
.
getLineContent
();
return
new
ViewLineData
(
...
...
@@ -922,7 +922,7 @@ class VisibleIdentitySplitLine implements ISplitLine {
);
}
public
getViewLinesData
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
fromOuputLineIndex
:
number
,
toOutputLineIndex
:
number
,
globalStartIndex
:
number
,
needed
:
boolean
[],
result
:
ViewLineData
[]):
void
{
public
getViewLinesData
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
_fromOuputLineIndex
:
number
,
_
toOutputLineIndex
:
number
,
globalStartIndex
:
number
,
needed
:
boolean
[],
result
:
ViewLineData
[]):
void
{
if
(
!
needed
[
globalStartIndex
])
{
result
[
globalStartIndex
]
=
null
;
return
;
...
...
@@ -930,7 +930,7 @@ class VisibleIdentitySplitLine implements ISplitLine {
result
[
globalStartIndex
]
=
this
.
getViewLineData
(
model
,
modelLineNumber
,
0
);
}
public
getModelColumnOfViewPosition
(
outputLineIndex
:
number
,
outputColumn
:
number
):
number
{
public
getModelColumnOfViewPosition
(
_
outputLineIndex
:
number
,
outputColumn
:
number
):
number
{
return
outputColumn
;
}
...
...
@@ -938,7 +938,7 @@ class VisibleIdentitySplitLine implements ISplitLine {
return
new
Position
(
deltaLineNumber
,
inputColumn
);
}
public
getViewLineNumberOfModelPosition
(
deltaLineNumber
:
number
,
inputColumn
:
number
):
number
{
public
getViewLineNumberOfModelPosition
(
deltaLineNumber
:
number
,
_
inputColumn
:
number
):
number
{
return
deltaLineNumber
;
}
}
...
...
@@ -964,39 +964,39 @@ class InvisibleIdentitySplitLine implements ISplitLine {
return
0
;
}
public
getViewLineContent
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
string
{
public
getViewLineContent
(
_model
:
ISimpleModel
,
_modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
string
{
throw
new
Error
(
'
Not supported
'
);
}
public
getViewLineLength
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
public
getViewLineLength
(
_model
:
ISimpleModel
,
_modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
number
{
throw
new
Error
(
'
Not supported
'
);
}
public
getViewLineMinColumn
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
public
getViewLineMinColumn
(
_model
:
ISimpleModel
,
_modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
number
{
throw
new
Error
(
'
Not supported
'
);
}
public
getViewLineMaxColumn
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
public
getViewLineMaxColumn
(
_model
:
ISimpleModel
,
_modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
number
{
throw
new
Error
(
'
Not supported
'
);
}
public
getViewLineData
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
ViewLineData
{
public
getViewLineData
(
_model
:
ISimpleModel
,
_modelLineNumber
:
number
,
_
outputLineIndex
:
number
):
ViewLineData
{
throw
new
Error
(
'
Not supported
'
);
}
public
getViewLinesData
(
model
:
ISimpleModel
,
modelLineNumber
:
number
,
fromOuputLineIndex
:
number
,
toOutputLineIndex
:
number
,
globalStartIndex
:
number
,
needed
:
boolean
[],
result
:
ViewLineData
[]):
void
{
public
getViewLinesData
(
_model
:
ISimpleModel
,
_modelLineNumber
:
number
,
_fromOuputLineIndex
:
number
,
_toOutputLineIndex
:
number
,
_globalStartIndex
:
number
,
_needed
:
boolean
[],
_
result
:
ViewLineData
[]):
void
{
throw
new
Error
(
'
Not supported
'
);
}
public
getModelColumnOfViewPosition
(
outputLineIndex
:
number
,
outputColumn
:
number
):
number
{
public
getModelColumnOfViewPosition
(
_outputLineIndex
:
number
,
_
outputColumn
:
number
):
number
{
throw
new
Error
(
'
Not supported
'
);
}
public
getViewPositionOfModelPosition
(
deltaLineNumber
:
number
,
inputColumn
:
number
):
Position
{
public
getViewPositionOfModelPosition
(
_deltaLineNumber
:
number
,
_
inputColumn
:
number
):
Position
{
throw
new
Error
(
'
Not supported
'
);
}
public
getViewLineNumberOfModelPosition
(
deltaLineNumber
:
number
,
inputColumn
:
number
):
number
{
public
getViewLineNumberOfModelPosition
(
_deltaLineNumber
:
number
,
_
inputColumn
:
number
):
number
{
throw
new
Error
(
'
Not supported
'
);
}
}
...
...
@@ -1080,7 +1080,7 @@ export class SplitLine implements ISplitLine {
return
r
;
}
public
getViewLineMinColumn
(
model
:
ITextModel
,
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
public
getViewLineMinColumn
(
_model
:
ITextModel
,
_
modelLineNumber
:
number
,
outputLineIndex
:
number
):
number
{
if
(
!
this
.
_isVisible
)
{
throw
new
Error
(
'
Not supported
'
);
}
...
...
@@ -1230,11 +1230,11 @@ export class IdentityCoordinatesConverter implements ICoordinatesConverter {
return
this
.
_validRange
(
viewRange
);
}
public
validateViewPosition
(
viewPosition
:
Position
,
expectedModelPosition
:
Position
):
Position
{
public
validateViewPosition
(
_
viewPosition
:
Position
,
expectedModelPosition
:
Position
):
Position
{
return
this
.
_validPosition
(
expectedModelPosition
);
}
public
validateViewRange
(
viewRange
:
Range
,
expectedModelRange
:
Range
):
Range
{
public
validateViewRange
(
_
viewRange
:
Range
,
expectedModelRange
:
Range
):
Range
{
return
this
.
_validRange
(
expectedModelRange
);
}
...
...
@@ -1282,40 +1282,40 @@ export class IdentityLinesCollection implements IViewModelLinesCollection {
return
false
;
}
public
setTabSize
(
newTabSize
:
number
):
boolean
{
public
setTabSize
(
_
newTabSize
:
number
):
boolean
{
return
false
;
}
public
setWrappingSettings
(
wrappingIndent
:
WrappingIndent
,
wrappingColumn
:
number
,
columnsForFullWidthChar
:
number
):
boolean
{
public
setWrappingSettings
(
_wrappingIndent
:
WrappingIndent
,
_wrappingColumn
:
number
,
_
columnsForFullWidthChar
:
number
):
boolean
{
return
false
;
}
public
onModelFlushed
():
void
{
}
public
onModelLinesDeleted
(
versionId
:
number
,
fromLineNumber
:
number
,
toLineNumber
:
number
):
viewEvents
.
ViewLinesDeletedEvent
{
public
onModelLinesDeleted
(
_
versionId
:
number
,
fromLineNumber
:
number
,
toLineNumber
:
number
):
viewEvents
.
ViewLinesDeletedEvent
{
return
new
viewEvents
.
ViewLinesDeletedEvent
(
fromLineNumber
,
toLineNumber
);
}
public
onModelLinesInserted
(
versionId
:
number
,
fromLineNumber
:
number
,
toLineNumber
:
number
,
text
:
string
[]):
viewEvents
.
ViewLinesInsertedEvent
{
public
onModelLinesInserted
(
_versionId
:
number
,
fromLineNumber
:
number
,
toLineNumber
:
number
,
_
text
:
string
[]):
viewEvents
.
ViewLinesInsertedEvent
{
return
new
viewEvents
.
ViewLinesInsertedEvent
(
fromLineNumber
,
toLineNumber
);
}
public
onModelLineChanged
(
versionId
:
number
,
lineNumber
:
number
,
newText
:
string
):
[
boolean
,
viewEvents
.
ViewLinesChangedEvent
,
viewEvents
.
ViewLinesInsertedEvent
,
viewEvents
.
ViewLinesDeletedEvent
]
{
public
onModelLineChanged
(
_versionId
:
number
,
lineNumber
:
number
,
_
newText
:
string
):
[
boolean
,
viewEvents
.
ViewLinesChangedEvent
,
viewEvents
.
ViewLinesInsertedEvent
,
viewEvents
.
ViewLinesDeletedEvent
]
{
return
[
false
,
new
viewEvents
.
ViewLinesChangedEvent
(
lineNumber
,
lineNumber
),
null
,
null
];
}
public
acceptVersionId
(
versionId
:
number
):
void
{
public
acceptVersionId
(
_
versionId
:
number
):
void
{
}
public
getViewLineCount
():
number
{
return
this
.
model
.
getLineCount
();
}
public
warmUpLookupCache
(
viewStartLineNumber
:
number
,
viewEndLineNumber
:
number
):
void
{
public
warmUpLookupCache
(
_viewStartLineNumber
:
number
,
_
viewEndLineNumber
:
number
):
void
{
}
public
getActiveIndentGuide
(
viewLineNumber
:
number
,
minLineNumber
:
number
,
maxLineNumber
:
number
):
IActiveIndentGuideInfo
{
public
getActiveIndentGuide
(
viewLineNumber
:
number
,
_minLineNumber
:
number
,
_
maxLineNumber
:
number
):
IActiveIndentGuideInfo
{
return
{
startLineNumber
:
viewLineNumber
,
endLineNumber
:
viewLineNumber
,
...
...
src/vs/editor/contrib/find/findWidget.ts
浏览文件 @
1e5a5727
...
...
@@ -202,15 +202,13 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
this
.
_applyTheme
(
themeService
.
getTheme
());
this
.
_register
(
themeService
.
onThemeChange
(
this
.
_applyTheme
.
bind
(
this
)));
this
.
_register
(
this
.
_codeEditor
.
onDidChangeModel
((
e
)
=>
{
this
.
_register
(
this
.
_codeEditor
.
onDidChangeModel
(()
=>
{
if
(
!
this
.
_isVisible
)
{
return
;
}
if
(
this
.
_viewZoneId
===
undefined
)
{
return
;
}
this
.
_codeEditor
.
changeViewZones
((
accessor
)
=>
{
accessor
.
removeZone
(
this
.
_viewZoneId
);
this
.
_viewZoneId
=
undefined
;
...
...
@@ -267,7 +265,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
}
if
(
e
.
isRevealed
)
{
if
(
this
.
_state
.
isRevealed
)
{
this
.
_reveal
(
true
);
this
.
_reveal
();
}
else
{
this
.
_hide
(
true
);
}
...
...
@@ -397,7 +395,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
this
.
_toggleReplaceBtn
.
setEnabled
(
this
.
_isVisible
&&
canReplace
);
}
private
_reveal
(
animate
:
boolean
):
void
{
private
_reveal
():
void
{
if
(
!
this
.
_isVisible
)
{
this
.
_isVisible
=
true
;
...
...
@@ -696,13 +694,13 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
}
// ----- sash
public
getHorizontalSashTop
(
sash
:
Sash
):
number
{
public
getHorizontalSashTop
(
_
sash
:
Sash
):
number
{
return
0
;
}
public
getHorizontalSashLeft
?(
sash
:
Sash
):
number
{
public
getHorizontalSashLeft
?(
_
sash
:
Sash
):
number
{
return
0
;
}
public
getHorizontalSashWidth
?(
sash
:
Sash
):
number
{
public
getHorizontalSashWidth
?(
_
sash
:
Sash
):
number
{
return
500
;
}
...
...
@@ -858,7 +856,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
this
.
_register
(
dom
.
addStandardDisposableListener
(
this
.
_replaceInputBox
.
inputElement
,
'
keydown
'
,
(
e
)
=>
this
.
_onReplaceInputKeyDown
(
e
)));
this
.
_register
(
this
.
_replaceInputBox
.
onDidChange
((
e
)
=>
{
this
.
_register
(
this
.
_replaceInputBox
.
onDidChange
(()
=>
{
this
.
_state
.
change
({
replaceString
:
this
.
_replaceInputBox
.
value
},
false
);
}));
...
...
@@ -937,7 +935,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
this
.
_resized
=
false
;
let
originalWidth
=
FIND_WIDGET_INITIAL_WIDTH
;
this
.
_register
(
this
.
_resizeSash
.
onDidStart
((
e
:
ISashEvent
)
=>
{
this
.
_register
(
this
.
_resizeSash
.
onDidStart
(()
=>
{
originalWidth
=
dom
.
getTotalWidth
(
this
.
_domNode
);
}));
...
...
@@ -1009,7 +1007,7 @@ class SimpleCheckbox extends Widget {
this
.
_opts
.
parent
.
appendChild
(
this
.
_domNode
);
this
.
onchange
(
this
.
_checkbox
,
(
e
)
=>
{
this
.
onchange
(
this
.
_checkbox
,
()
=>
{
this
.
_opts
.
onChange
();
});
}
...
...
src/vs/editor/contrib/folding/folding.ts
浏览文件 @
1e5a5727
...
...
@@ -189,9 +189,9 @@ export class FoldingController implements IEditorContribution {
this
.
cursorChangedScheduler
=
new
RunOnceScheduler
(()
=>
this
.
revealCursor
(),
200
);
this
.
localToDispose
.
push
(
this
.
cursorChangedScheduler
);
this
.
localToDispose
.
push
(
this
.
editor
.
onDidChangeModelLanguageConfiguration
(
e
=>
this
.
onModelContentChanged
()));
// covers model language changes as well
this
.
localToDispose
.
push
(
this
.
editor
.
onDidChangeModelContent
(
e
=>
this
.
onModelContentChanged
()));
this
.
localToDispose
.
push
(
this
.
editor
.
onDidChangeCursorPosition
(
e
=>
this
.
onCursorPositionChanged
()));
this
.
localToDispose
.
push
(
this
.
editor
.
onDidChangeModelLanguageConfiguration
(
()
=>
this
.
onModelContentChanged
()));
// covers model language changes as well
this
.
localToDispose
.
push
(
this
.
editor
.
onDidChangeModelContent
(
()
=>
this
.
onModelContentChanged
()));
this
.
localToDispose
.
push
(
this
.
editor
.
onDidChangeCursorPosition
(
()
=>
this
.
onCursorPositionChanged
()));
this
.
localToDispose
.
push
(
this
.
editor
.
onMouseDown
(
e
=>
this
.
onEditorMouseDown
(
e
)));
this
.
localToDispose
.
push
(
this
.
editor
.
onMouseUp
(
e
=>
this
.
onEditorMouseUp
(
e
)));
this
.
localToDispose
.
push
({
...
...
@@ -447,7 +447,7 @@ abstract class FoldingAction<T> extends EditorAction {
return
this
.
getSelectedLines
(
editor
);
}
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
):
void
{
public
run
(
_accessor
:
ServicesAccessor
,
_
editor
:
ICodeEditor
):
void
{
}
}
...
...
@@ -509,7 +509,7 @@ class UnfoldAction extends FoldingAction<FoldingArguments> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
,
args
:
FoldingArguments
):
void
{
invoke
(
_
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
,
args
:
FoldingArguments
):
void
{
let
levels
=
args
&&
args
.
levels
||
1
;
let
lineNumbers
=
this
.
getLineNumbers
(
args
,
editor
);
if
(
args
&&
args
.
direction
===
'
up
'
)
{
...
...
@@ -536,7 +536,7 @@ class UnFoldRecursivelyAction extends FoldingAction<void> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
,
args
:
any
):
void
{
invoke
(
_foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
,
_
args
:
any
):
void
{
setCollapseStateLevelsDown
(
foldingModel
,
false
,
Number
.
MAX_VALUE
,
this
.
getSelectedLines
(
editor
));
}
}
...
...
@@ -574,7 +574,7 @@ class FoldAction extends FoldingAction<FoldingArguments> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
,
args
:
FoldingArguments
):
void
{
invoke
(
_
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
,
args
:
FoldingArguments
):
void
{
let
levels
=
args
&&
args
.
levels
||
1
;
let
lineNumbers
=
this
.
getLineNumbers
(
args
,
editor
);
if
(
args
&&
args
.
direction
===
'
up
'
)
{
...
...
@@ -601,7 +601,7 @@ class FoldRecursivelyAction extends FoldingAction<void> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
invoke
(
_
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
let
selectedLines
=
this
.
getSelectedLines
(
editor
);
setCollapseStateLevelsDown
(
foldingModel
,
true
,
Number
.
MAX_VALUE
,
selectedLines
);
}
...
...
@@ -623,7 +623,7 @@ class FoldAllBlockCommentsAction extends FoldingAction<void> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
invoke
(
_
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
if
(
foldingModel
.
regions
.
hasTypes
())
{
setCollapseStateForType
(
foldingModel
,
FoldingRangeKind
.
Comment
.
value
,
true
);
}
else
{
...
...
@@ -652,7 +652,7 @@ class FoldAllRegionsAction extends FoldingAction<void> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
invoke
(
_
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
if
(
foldingModel
.
regions
.
hasTypes
())
{
setCollapseStateForType
(
foldingModel
,
FoldingRangeKind
.
Region
.
value
,
true
);
}
else
{
...
...
@@ -681,7 +681,7 @@ class UnfoldAllRegionsAction extends FoldingAction<void> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
invoke
(
_
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
if
(
foldingModel
.
regions
.
hasTypes
())
{
setCollapseStateForType
(
foldingModel
,
FoldingRangeKind
.
Region
.
value
,
false
);
}
else
{
...
...
@@ -710,7 +710,7 @@ class FoldAllAction extends FoldingAction<void> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
invoke
(
_foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
_
editor
:
ICodeEditor
):
void
{
setCollapseStateLevelsDown
(
foldingModel
,
true
);
}
}
...
...
@@ -731,7 +731,7 @@ class UnfoldAllAction extends FoldingAction<void> {
});
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
invoke
(
_foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
_
editor
:
ICodeEditor
):
void
{
setCollapseStateLevelsDown
(
foldingModel
,
false
);
}
}
...
...
@@ -744,7 +744,7 @@ class FoldLevelAction extends FoldingAction<void> {
return
parseInt
(
this
.
id
.
substr
(
FoldLevelAction
.
ID_PREFIX
.
length
));
}
invoke
(
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
invoke
(
_
foldingController
:
FoldingController
,
foldingModel
:
FoldingModel
,
editor
:
ICodeEditor
):
void
{
setCollapseStateAtLevel
(
foldingModel
,
this
.
getFoldingLevel
(),
true
,
this
.
getSelectedLines
(
editor
));
}
}
...
...
src/vs/workbench/electron-browser/actions.ts
浏览文件 @
1e5a5727
...
...
@@ -415,7 +415,6 @@ export abstract class BaseOpenRecentAction extends Action {
private
windowsService
:
IWindowsService
,
private
quickInputService
:
IQuickInputService
,
private
contextService
:
IWorkspaceContextService
,
private
environmentService
:
IEnvironmentService
,
private
labelService
:
ILabelService
,
private
keybindingService
:
IKeybindingService
,
private
modelService
:
IModelService
,
...
...
@@ -433,7 +432,7 @@ export abstract class BaseOpenRecentAction extends Action {
private
openRecent
(
recentWorkspaces
:
(
IWorkspaceIdentifier
|
ISingleFolderWorkspaceIdentifier
)[],
recentFiles
:
URI
[]):
void
{
const
toPick
=
(
workspace
:
IWorkspaceIdentifier
|
ISingleFolderWorkspaceIdentifier
|
URI
,
fileKind
:
FileKind
,
environmentService
:
IEnvironmentService
,
labelService
:
ILabelService
,
buttons
:
IQuickInputButton
[])
=>
{
const
toPick
=
(
workspace
:
IWorkspaceIdentifier
|
ISingleFolderWorkspaceIdentifier
|
URI
,
fileKind
:
FileKind
,
labelService
:
ILabelService
,
buttons
:
IQuickInputButton
[])
=>
{
let
resource
:
URI
;
let
label
:
string
;
let
description
:
string
;
...
...
@@ -467,8 +466,8 @@ export abstract class BaseOpenRecentAction extends Action {
return
this
.
windowService
.
openWindow
([
resource
],
{
forceNewWindow
,
forceOpenWorkspaceAsFile
:
isFile
});
};
const
workspacePicks
=
recentWorkspaces
.
map
(
workspace
=>
toPick
(
workspace
,
isSingleFolderWorkspaceIdentifier
(
workspace
)
?
FileKind
.
FOLDER
:
FileKind
.
ROOT_FOLDER
,
this
.
environmentService
,
this
.
labelService
,
!
this
.
isQuickNavigate
()
?
[
this
.
removeFromRecentlyOpened
]
:
void
0
));
const
filePicks
=
recentFiles
.
map
(
p
=>
toPick
(
p
,
FileKind
.
FILE
,
this
.
environmentService
,
this
.
labelService
,
!
this
.
isQuickNavigate
()
?
[
this
.
removeFromRecentlyOpened
]
:
void
0
));
const
workspacePicks
=
recentWorkspaces
.
map
(
workspace
=>
toPick
(
workspace
,
isSingleFolderWorkspaceIdentifier
(
workspace
)
?
FileKind
.
FOLDER
:
FileKind
.
ROOT_FOLDER
,
this
.
labelService
,
!
this
.
isQuickNavigate
()
?
[
this
.
removeFromRecentlyOpened
]
:
void
0
));
const
filePicks
=
recentFiles
.
map
(
p
=>
toPick
(
p
,
FileKind
.
FILE
,
this
.
labelService
,
!
this
.
isQuickNavigate
()
?
[
this
.
removeFromRecentlyOpened
]
:
void
0
));
// focus second entry if the first recent workspace is the current workspace
let
autoFocusSecondEntry
:
boolean
=
recentWorkspaces
[
0
]
&&
this
.
contextService
.
isCurrentWorkspace
(
recentWorkspaces
[
0
]);
...
...
@@ -511,13 +510,12 @@ export class OpenRecentAction extends BaseOpenRecentAction {
@
IWindowsService
windowsService
:
IWindowsService
,
@
IQuickInputService
quickInputService
:
IQuickInputService
,
@
IWorkspaceContextService
contextService
:
IWorkspaceContextService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
,
@
IModelService
modelService
:
IModelService
,
@
IModeService
modeService
:
IModeService
,
@
ILabelService
labelService
:
ILabelService
)
{
super
(
id
,
label
,
windowService
,
windowsService
,
quickInputService
,
contextService
,
environmentService
,
labelService
,
keybindingService
,
modelService
,
modeService
);
super
(
id
,
label
,
windowService
,
windowsService
,
quickInputService
,
contextService
,
labelService
,
keybindingService
,
modelService
,
modeService
);
}
protected
isQuickNavigate
():
boolean
{
...
...
@@ -537,13 +535,12 @@ export class QuickOpenRecentAction extends BaseOpenRecentAction {
@
IWindowsService
windowsService
:
IWindowsService
,
@
IQuickInputService
quickInputService
:
IQuickInputService
,
@
IWorkspaceContextService
contextService
:
IWorkspaceContextService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
@
IKeybindingService
keybindingService
:
IKeybindingService
,
@
IModelService
modelService
:
IModelService
,
@
IModeService
modeService
:
IModeService
,
@
ILabelService
labelService
:
ILabelService
)
{
super
(
id
,
label
,
windowService
,
windowsService
,
quickInputService
,
contextService
,
environmentService
,
labelService
,
keybindingService
,
modelService
,
modeService
);
super
(
id
,
label
,
windowService
,
windowsService
,
quickInputService
,
contextService
,
labelService
,
keybindingService
,
modelService
,
modeService
);
}
protected
isQuickNavigate
():
boolean
{
...
...
@@ -746,15 +743,15 @@ export abstract class BaseNavigationAction extends Action {
return
TPromise
.
as
(
false
);
}
protected
navigateOnEditorFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
|
IPanel
>
{
protected
navigateOnEditorFocus
(
_isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
|
IPanel
>
{
return
TPromise
.
as
(
true
);
}
protected
navigateOnPanelFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IPanel
>
{
protected
navigateOnPanelFocus
(
_isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IPanel
>
{
return
TPromise
.
as
(
true
);
}
protected
navigateOnSidebarFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
>
{
protected
navigateOnSidebarFocus
(
_isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
>
{
return
TPromise
.
as
(
true
);
}
...
...
@@ -814,7 +811,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
super
(
id
,
label
,
editorGroupService
,
panelService
,
partService
,
viewletService
);
}
protected
navigateOnEditorFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
>
{
protected
navigateOnEditorFocus
(
isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
>
{
return
this
.
navigateAcrossEditorGroup
(
GroupDirection
.
LEFT
)
.
then
(
didNavigate
=>
{
if
(
didNavigate
)
{
...
...
@@ -841,7 +838,7 @@ export class NavigateLeftAction extends BaseNavigationAction {
return
TPromise
.
as
(
false
);
}
protected
navigateOnSidebarFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
protected
navigateOnSidebarFocus
(
isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
if
(
!
isSidebarPositionLeft
)
{
return
this
.
navigateToEditorGroup
(
GroupLocation
.
LAST
);
}
...
...
@@ -885,7 +882,7 @@ export class NavigateRightAction extends BaseNavigationAction {
});
}
protected
navigateOnPanelFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
>
{
protected
navigateOnPanelFocus
(
isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IViewlet
>
{
if
(
!
isSidebarPositionLeft
)
{
return
this
.
navigateToSidebar
();
}
...
...
@@ -893,7 +890,7 @@ export class NavigateRightAction extends BaseNavigationAction {
return
TPromise
.
as
(
false
);
}
protected
navigateOnSidebarFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
protected
navigateOnSidebarFocus
(
isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
if
(
isSidebarPositionLeft
)
{
return
this
.
navigateToEditorGroup
(
GroupLocation
.
FIRST
);
}
...
...
@@ -918,11 +915,11 @@ export class NavigateUpAction extends BaseNavigationAction {
super
(
id
,
label
,
editorGroupService
,
panelService
,
partService
,
viewletService
);
}
protected
navigateOnEditorFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
protected
navigateOnEditorFocus
(
_isSidebarPositionLeft
:
boolean
,
_
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
return
this
.
navigateAcrossEditorGroup
(
GroupDirection
.
UP
);
}
protected
navigateOnPanelFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
protected
navigateOnPanelFocus
(
_
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
>
{
if
(
isPanelPositionDown
)
{
return
this
.
navigateToEditorGroup
(
GroupLocation
.
LAST
);
}
...
...
@@ -947,7 +944,7 @@ export class NavigateDownAction extends BaseNavigationAction {
super
(
id
,
label
,
editorGroupService
,
panelService
,
partService
,
viewletService
);
}
protected
navigateOnEditorFocus
(
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IPanel
>
{
protected
navigateOnEditorFocus
(
_
isSidebarPositionLeft
:
boolean
,
isPanelPositionDown
:
boolean
):
TPromise
<
boolean
|
IPanel
>
{
return
this
.
navigateAcrossEditorGroup
(
GroupDirection
.
DOWN
)
.
then
(
didNavigate
=>
{
if
(
didNavigate
)
{
...
...
@@ -1042,8 +1039,8 @@ export class NewWindowTab extends Action {
static
readonly
LABEL
=
nls
.
localize
(
'
newTab
'
,
"
New Window Tab
"
);
constructor
(
id
:
string
,
label
:
string
,
_
id
:
string
,
_
label
:
string
,
@
IWindowsService
private
windowsService
:
IWindowsService
)
{
super
(
NewWindowTab
.
ID
,
NewWindowTab
.
LABEL
);
...
...
@@ -1060,8 +1057,8 @@ export class ShowPreviousWindowTab extends Action {
static
readonly
LABEL
=
nls
.
localize
(
'
showPreviousTab
'
,
"
Show Previous Window Tab
"
);
constructor
(
id
:
string
,
label
:
string
,
_
id
:
string
,
_
label
:
string
,
@
IWindowsService
private
windowsService
:
IWindowsService
)
{
super
(
ShowPreviousWindowTab
.
ID
,
ShowPreviousWindowTab
.
LABEL
);
...
...
@@ -1078,8 +1075,8 @@ export class ShowNextWindowTab extends Action {
static
readonly
LABEL
=
nls
.
localize
(
'
showNextWindowTab
'
,
"
Show Next Window Tab
"
);
constructor
(
id
:
string
,
label
:
string
,
_
id
:
string
,
_
label
:
string
,
@
IWindowsService
private
windowsService
:
IWindowsService
)
{
super
(
ShowNextWindowTab
.
ID
,
ShowNextWindowTab
.
LABEL
);
...
...
@@ -1096,8 +1093,8 @@ export class MoveWindowTabToNewWindow extends Action {
static
readonly
LABEL
=
nls
.
localize
(
'
moveWindowTabToNewWindow
'
,
"
Move Window Tab to New Window
"
);
constructor
(
id
:
string
,
label
:
string
,
_
id
:
string
,
_
label
:
string
,
@
IWindowsService
private
windowsService
:
IWindowsService
)
{
super
(
MoveWindowTabToNewWindow
.
ID
,
MoveWindowTabToNewWindow
.
LABEL
);
...
...
@@ -1114,8 +1111,8 @@ export class MergeAllWindowTabs extends Action {
static
readonly
LABEL
=
nls
.
localize
(
'
mergeAllWindowTabs
'
,
"
Merge All Windows
"
);
constructor
(
id
:
string
,
label
:
string
,
_
id
:
string
,
_
label
:
string
,
@
IWindowsService
private
windowsService
:
IWindowsService
)
{
super
(
MergeAllWindowTabs
.
ID
,
MergeAllWindowTabs
.
LABEL
);
...
...
@@ -1132,8 +1129,8 @@ export class ToggleWindowTabsBar extends Action {
static
readonly
LABEL
=
nls
.
localize
(
'
toggleWindowTabsBar
'
,
"
Toggle Window Tabs Bar
"
);
constructor
(
id
:
string
,
label
:
string
,
_
id
:
string
,
_
label
:
string
,
@
IWindowsService
private
windowsService
:
IWindowsService
)
{
super
(
ToggleWindowTabsBar
.
ID
,
ToggleWindowTabsBar
.
LABEL
);
...
...
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
1e5a5727
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录