Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5a05170b
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,发现更多精彩内容 >>
提交
5a05170b
编写于
1月 19, 2017
作者:
A
Artem Govorov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add Toggle Output Scroll Lock action
上级
b7f44d29
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
52 addition
and
8 deletion
+52
-8
src/vs/workbench/parts/output/browser/output.contribution.ts
src/vs/workbench/parts/output/browser/output.contribution.ts
+4
-1
src/vs/workbench/parts/output/browser/outputActions.ts
src/vs/workbench/parts/output/browser/outputActions.ts
+17
-0
src/vs/workbench/parts/output/browser/outputPanel.ts
src/vs/workbench/parts/output/browser/outputPanel.ts
+3
-2
src/vs/workbench/parts/output/browser/outputServices.ts
src/vs/workbench/parts/output/browser/outputServices.ts
+22
-5
src/vs/workbench/parts/output/common/output.ts
src/vs/workbench/parts/output/common/output.ts
+6
-0
未找到文件。
src/vs/workbench/parts/output/browser/output.contribution.ts
浏览文件 @
5a05170b
...
...
@@ -14,7 +14,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
IWorkbenchActionRegistry
,
Extensions
as
ActionExtensions
}
from
'
vs/workbench/common/actionRegistry
'
;
import
{
OutputService
}
from
'
vs/workbench/parts/output/browser/outputServices
'
;
import
{
ToggleOutputAction
,
ClearOutputAction
}
from
'
vs/workbench/parts/output/browser/outputActions
'
;
import
{
ToggleOutputAction
,
ClearOutputAction
,
ToggleOutputScrollLockAction
}
from
'
vs/workbench/parts/output/browser/outputActions
'
;
import
{
OUTPUT_MODE_ID
,
OUTPUT_MIME
,
OUTPUT_PANEL_ID
,
IOutputService
}
from
'
vs/workbench/parts/output/common/output
'
;
import
{
PanelRegistry
,
Extensions
,
PanelDescriptor
}
from
'
vs/workbench/browser/panel
'
;
import
{
EditorContextKeys
}
from
'
vs/editor/common/editorCommon
'
;
...
...
@@ -55,6 +55,9 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleOutputActi
actionRegistry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
ClearOutputAction
,
ClearOutputAction
.
ID
,
ClearOutputAction
.
LABEL
),
'
View: Clear Output
'
,
nls
.
localize
(
'
viewCategory
'
,
"
View
"
));
actionRegistry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
ToggleOutputScrollLockAction
,
ToggleOutputScrollLockAction
.
ID
,
ToggleOutputScrollLockAction
.
LABEL
),
'
View: Toggle Output Scroll Lock
'
,
nls
.
localize
(
'
viewCategory
'
,
"
View
"
));
interface
IActionDescriptor
{
id
:
string
;
handler
:
ICommandHandler
;
...
...
src/vs/workbench/parts/output/browser/outputActions.ts
浏览文件 @
5a05170b
...
...
@@ -48,6 +48,23 @@ export class ClearOutputAction extends Action {
}
}
export
class
ToggleOutputScrollLockAction
extends
Action
{
public
static
ID
=
'
workbench.output.action.toggleOutputScrollLock
'
;
public
static
LABEL
=
nls
.
localize
(
'
toggleOutputScrollLock
'
,
"
Toggle Output Scroll Lock
"
);
constructor
(
id
:
string
,
label
:
string
,
@
IOutputService
private
outputService
:
IOutputService
)
{
super
(
id
,
label
,
'
output-action toggle-output-scroll-lock
'
);
}
public
run
():
TPromise
<
any
>
{
this
.
outputService
.
getActiveChannel
().
toggleScrollLock
();
return
TPromise
.
as
(
true
);
}
}
export
class
SwitchOutputAction
extends
Action
{
public
static
ID
=
'
workbench.output.action.switchBetweenOutputs
'
;
...
...
src/vs/workbench/parts/output/browser/outputPanel.ts
浏览文件 @
5a05170b
...
...
@@ -19,7 +19,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import
{
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
TextResourceEditor
}
from
'
vs/workbench/browser/parts/editor/textResourceEditor
'
;
import
{
OutputEditors
,
OUTPUT_PANEL_ID
,
IOutputService
,
CONTEXT_IN_OUTPUT
}
from
'
vs/workbench/parts/output/common/output
'
;
import
{
SwitchOutputAction
,
SwitchOutputActionItem
,
ClearOutputAction
}
from
'
vs/workbench/parts/output/browser/outputActions
'
;
import
{
SwitchOutputAction
,
SwitchOutputActionItem
,
ClearOutputAction
,
ToggleOutputScrollLockAction
}
from
'
vs/workbench/parts/output/browser/outputActions
'
;
import
{
IThemeService
}
from
'
vs/workbench/services/themes/common/themeService
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
...
...
@@ -56,7 +56,8 @@ export class OutputPanel extends TextResourceEditor {
if
(
!
this
.
actions
)
{
this
.
actions
=
[
this
.
instantiationService
.
createInstance
(
SwitchOutputAction
),
this
.
instantiationService
.
createInstance
(
ClearOutputAction
,
ClearOutputAction
.
ID
,
ClearOutputAction
.
LABEL
)
this
.
instantiationService
.
createInstance
(
ClearOutputAction
,
ClearOutputAction
.
ID
,
ClearOutputAction
.
LABEL
),
this
.
instantiationService
.
createInstance
(
ToggleOutputScrollLockAction
,
ToggleOutputScrollLockAction
.
ID
,
ToggleOutputScrollLockAction
.
LABEL
)
];
this
.
actions
.
forEach
(
a
=>
{
...
...
src/vs/workbench/parts/output/browser/outputServices.ts
浏览文件 @
5a05170b
...
...
@@ -41,6 +41,7 @@ export class OutputService implements IOutputService {
private
_onActiveOutputChannel
:
Emitter
<
string
>
;
private
_outputLinkDetector
:
OutputLinkProvider
;
private
_outputContentProvider
:
OutputContentProvider
;
constructor
(
@
IStorageService
private
storageService
:
IStorageService
,
...
...
@@ -61,8 +62,10 @@ export class OutputService implements IOutputService {
this
.
_outputLinkDetector
=
new
OutputLinkProvider
(
contextService
,
modelService
);
this
.
_outputContentProvider
=
instantiationService
.
createInstance
(
OutputContentProvider
,
this
);
// Register as text model content provider for output
textModelResolverService
.
registerTextModelContentProvider
(
OUTPUT_SCHEME
,
instantiationService
.
createInstance
(
OutputContentProvider
,
this
)
);
textModelResolverService
.
registerTextModelContentProvider
(
OUTPUT_SCHEME
,
this
.
_outputContentProvider
);
}
public
get
onOutput
():
Event
<
IOutputEvent
>
{
...
...
@@ -89,7 +92,8 @@ export class OutputService implements IOutputService {
},
append
:
(
output
:
string
)
=>
this
.
append
(
id
,
output
),
show
:
(
preserveFocus
:
boolean
)
=>
this
.
showOutput
(
id
,
preserveFocus
),
clear
:
()
=>
this
.
clearOutput
(
id
)
clear
:
()
=>
this
.
clearOutput
(
id
),
toggleScrollLock
:
()
=>
this
.
_outputContentProvider
.
toggleScrollLock
(
id
)
};
}
...
...
@@ -154,6 +158,7 @@ class OutputContentProvider implements ITextModelContentProvider {
private
bufferedOutput
:
{
[
channel
:
string
]:
string
;
};
private
appendOutputScheduler
:
{
[
channel
:
string
]:
RunOnceScheduler
;
};
private
channelIdsWithScrollLock
:
Set
<
string
>
=
new
Set
();
private
toDispose
:
IDisposable
[];
...
...
@@ -265,9 +270,11 @@ class OutputContentProvider implements ITextModelContentProvider {
model
.
applyEdits
([
EditOperation
.
insert
(
new
Position
(
lastLine
,
lastLineMaxColumn
),
bufferedOutput
)]);
}
// reveal last line
const
panel
=
this
.
panelService
.
getActivePanel
();
(
<
OutputPanel
>
panel
).
revealLastLine
(
true
);
if
(
!
this
.
channelIdsWithScrollLock
.
has
(
channel
))
{
// reveal last line
const
panel
=
this
.
panelService
.
getActivePanel
();
(
<
OutputPanel
>
panel
).
revealLastLine
(
true
);
}
}
private
isVisible
(
channel
:
string
):
boolean
{
...
...
@@ -276,6 +283,16 @@ class OutputContentProvider implements ITextModelContentProvider {
return
panel
&&
panel
.
getId
()
===
OUTPUT_PANEL_ID
&&
this
.
outputService
.
getActiveChannel
().
id
===
channel
;
}
public
toggleScrollLock
(
channelId
:
string
):
boolean
{
let
channelHadScrollLock
=
this
.
channelIdsWithScrollLock
.
has
(
channelId
);
if
(
channelHadScrollLock
)
{
this
.
channelIdsWithScrollLock
.
delete
(
channelId
)
}
else
{
this
.
channelIdsWithScrollLock
.
add
(
channelId
);
}
return
!
channelHadScrollLock
;
}
public
provideTextContent
(
resource
:
URI
):
TPromise
<
IModel
>
{
const
content
=
this
.
outputService
.
getChannel
(
resource
.
fsPath
).
output
;
...
...
src/vs/workbench/parts/output/common/output.ts
浏览文件 @
5a05170b
...
...
@@ -124,6 +124,12 @@ export interface IOutputChannel {
* Clears all received output for this channel.
*/
clear
():
void
;
/**
* Toggles scroll lock for this channel.
* Returns a flag indicating whether the scroll lock is on/off.
*/
toggleScrollLock
():
boolean
;
}
export
interface
IOutputChannelIdentifier
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录