Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
de3e63c0
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,发现更多精彩内容 >>
提交
de3e63c0
编写于
1月 04, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
trim [ExtHost|MainThread]Commands classes
上级
69aba098
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
44 deletion
+39
-44
src/vs/workbench/api/common/extHost.api.impl.ts
src/vs/workbench/api/common/extHost.api.impl.ts
+26
-7
src/vs/workbench/api/common/extHostCommands.ts
src/vs/workbench/api/common/extHostCommands.ts
+13
-37
未找到文件。
src/vs/workbench/api/common/extHost.api.impl.ts
浏览文件 @
de3e63c0
...
...
@@ -133,12 +133,36 @@ export class ExtHostAPIImplementation {
});
const
pluginHostCommands
=
this
.
_threadService
.
getRemotable
(
ExtHostCommands
);
const
pluginHostEditors
=
this
.
_threadService
.
getRemotable
(
ExtHostEditors
);
const
pluginHostMessageService
=
new
ExtHostMessageService
(
this
.
_threadService
,
this
.
commands
);
const
pluginHostQuickOpen
=
new
ExtHostQuickOpen
(
this
.
_threadService
);
const
pluginHostStatusBar
=
new
ExtHostStatusBar
(
this
.
_threadService
);
const
extHostOutputService
=
new
ExtHostOutputService
(
this
.
_threadService
);
// commands namespace
this
.
commands
=
{
registerCommand
<
T
>
(
id
:
string
,
command
:
<
T
>
(...
args
:
any
[])
=>
T
|
Thenable
<
T
>
,
thisArgs
?:
any
):
vscode
.
Disposable
{
return
pluginHostCommands
.
registerCommand
(
id
,
command
,
thisArgs
);
},
registerTextEditorCommand
(
commandId
:
string
,
callback
:
(
textEditor
:
vscode
.
TextEditor
,
edit
:
vscode
.
TextEditorEdit
)
=>
void
,
thisArg
?:
any
):
vscode
.
Disposable
{
return
pluginHostCommands
.
registerTextEditorCommand
(
commandId
,
callback
,
thisArg
);
registerTextEditorCommand
(
id
:
string
,
callback
:
(
textEditor
:
vscode
.
TextEditor
,
edit
:
vscode
.
TextEditorEdit
)
=>
void
,
thisArg
?:
any
):
vscode
.
Disposable
{
let
actualCallback
:
typeof
callback
=
thisArg
?
callback
.
bind
(
thisArg
)
:
callback
;
return
pluginHostCommands
.
registerCommand
(
id
,
()
=>
{
let
activeTextEditor
=
pluginHostEditors
.
getActiveTextEditor
();
if
(
!
activeTextEditor
)
{
console
.
warn
(
'
Cannot execute
'
+
id
+
'
because there is no active text editor.
'
);
return
;
}
activeTextEditor
.
edit
((
edit
:
vscode
.
TextEditorEdit
)
=>
{
actualCallback
(
activeTextEditor
,
edit
);
}).
then
((
result
)
=>
{
if
(
!
result
)
{
console
.
warn
(
'
Edits from command
'
+
id
+
'
were not applied.
'
);
}
},
(
err
)
=>
{
console
.
warn
(
'
An error occured while running command
'
+
id
,
err
);
});
});
},
executeCommand
<
T
>
(
id
:
string
,
...
args
:
any
[]):
Thenable
<
T
>
{
return
pluginHostCommands
.
executeCommand
(
id
,
args
);
...
...
@@ -148,11 +172,6 @@ export class ExtHostAPIImplementation {
}
};
const
pluginHostEditors
=
this
.
_threadService
.
getRemotable
(
ExtHostEditors
);
const
pluginHostMessageService
=
new
ExtHostMessageService
(
this
.
_threadService
,
this
.
commands
);
const
pluginHostQuickOpen
=
new
ExtHostQuickOpen
(
this
.
_threadService
);
const
pluginHostStatusBar
=
new
ExtHostStatusBar
(
this
.
_threadService
);
const
extHostOutputService
=
new
ExtHostOutputService
(
this
.
_threadService
);
this
.
window
=
{
get
activeTextEditor
()
{
return
pluginHostEditors
.
getActiveTextEditor
();
...
...
src/vs/workbench/api/common/extHostCommands.ts
浏览文件 @
de3e63c0
...
...
@@ -11,7 +11,6 @@ import {IKeybindingService, ICommandHandlerDescription} from 'vs/platform/keybin
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ExtHostEditors
}
from
'
vs/workbench/api/common/extHostEditors
'
;
import
{
Disposable
}
from
'
vs/workbench/api/common/extHostTypes
'
;
import
*
as
vscode
from
'
vscode
'
;
interface
CommandHandler
{
callback
:
Function
;
...
...
@@ -47,27 +46,6 @@ export class ExtHostCommands {
return
new
Disposable
(()
=>
delete
this
.
_commands
[
id
]);
}
registerTextEditorCommand
(
id
:
string
,
callback
:
(
textEditor
:
vscode
.
TextEditor
,
edit
:
vscode
.
TextEditorEdit
)
=>
void
,
thisArg
?:
any
):
vscode
.
Disposable
{
let
actualCallback
:
typeof
callback
=
thisArg
?
callback
.
bind
(
thisArg
)
:
callback
;
return
this
.
registerCommand
(
id
,
()
=>
{
let
activeTextEditor
=
this
.
_pluginHostEditors
.
getActiveTextEditor
();
if
(
!
activeTextEditor
)
{
console
.
warn
(
'
Cannot execute
'
+
id
+
'
because there is no active text editor.
'
);
return
;
}
activeTextEditor
.
edit
((
edit
:
vscode
.
TextEditorEdit
)
=>
{
actualCallback
(
activeTextEditor
,
edit
);
}).
then
((
result
)
=>
{
if
(
!
result
)
{
console
.
warn
(
'
Edits from command
'
+
id
+
'
were not applied.
'
);
}
},
(
err
)
=>
{
console
.
warn
(
'
An error occured while running command
'
+
id
,
err
);
});
});
}
executeCommand
<
T
>
(
id
:
string
,
...
args
:
any
[]):
Thenable
<
T
>
{
if
(
this
.
_commands
[
id
])
{
...
...
@@ -153,7 +131,7 @@ export class MainThreadCommands {
KeybindingsRegistry
.
registerCommandDesc
({
id
,
handler
:
(
serviceAccessor
,
...
args
:
any
[])
=>
{
return
this
.
_proxy
.
$executeContributedCommand
(
id
,
...
args
);
//TODO@Joh - we cannot serialize the args
return
this
.
_proxy
.
$executeContributedCommand
(
id
,
...
args
);
},
weight
:
undefined
,
context
:
undefined
,
...
...
@@ -174,9 +152,17 @@ export class MainThreadCommands {
$getCommands
():
Thenable
<
string
[]
>
{
return
TPromise
.
as
(
Object
.
keys
(
KeybindingsRegistry
.
getCommands
()));
}
}
$getCommandHandlerDescriptions
():
TPromise
<
{
[
id
:
string
]:
string
|
ICommandHandlerDescription
}
>
{
return
this
.
_proxy
.
$getContributedCommandHandlerDescriptions
().
then
(
result
=>
{
// --- command doc
KeybindingsRegistry
.
registerCommandDesc
({
id
:
'
_generateCommandsDocumentation
'
,
handler
:
function
(
accessor
)
{
return
accessor
.
get
(
IThreadService
).
getRemotable
(
ExtHostCommands
).
$getContributedCommandHandlerDescriptions
().
then
(
result
=>
{
// add local commands
const
commands
=
KeybindingsRegistry
.
getCommands
();
for
(
let
id
in
commands
)
{
let
{
description
}
=
commands
[
id
];
...
...
@@ -184,18 +170,8 @@ export class MainThreadCommands {
result
[
id
]
=
description
;
}
}
return
result
;
});
}
}
// --- command doc
KeybindingsRegistry
.
registerCommandDesc
({
id
:
'
_generateCommandsDocumentation
'
,
handler
:
function
(
accessor
)
{
return
accessor
.
get
(
IThreadService
).
getRemotable
(
MainThreadCommands
).
$getCommandHandlerDescriptions
().
then
(
result
=>
{
// print all as markdown
const
all
:
string
[]
=
[];
for
(
let
id
in
result
)
{
all
.
push
(
'
`
'
+
id
+
'
` -
'
+
_generateMarkdown
(
result
[
id
]));
...
...
@@ -225,4 +201,4 @@ function _generateMarkdown(description: string | ICommandHandlerDescription): st
parts
.
push
(
'
\n\n
'
);
return
parts
.
join
(
''
);
}
}
\ No newline at end of file
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录