Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c9895288
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,体验更适合开发者的 AI 搜索 >>
提交
c9895288
编写于
8月 21, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
show extension name with id, show title also on severity-label, #21302
上级
1caf0fa4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
13 deletion
+16
-13
src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
...orkbench/api/electron-browser/mainThreadMessageService.ts
+4
-4
src/vs/workbench/api/node/extHost.api.impl.ts
src/vs/workbench/api/node/extHost.api.impl.ts
+4
-4
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostMessageService.ts
src/vs/workbench/api/node/extHostMessageService.ts
+5
-4
src/vs/workbench/services/message/browser/messageList.ts
src/vs/workbench/services/message/browser/messageList.ts
+2
-0
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadMessageService.ts
浏览文件 @
c9895288
...
...
@@ -11,7 +11,7 @@ import { Action } from 'vs/base/common/actions';
import
{
TPromise
as
Promise
}
from
'
vs/base/common/winjs.base
'
;
import
{
MainThreadMessageServiceShape
,
MainContext
,
IExtHostContext
,
MainThreadMessageOptions
}
from
'
../node/extHost.protocol
'
;
import
{
extHostNamedCustomer
}
from
"
vs/workbench/api/electron-browser/extHostCustomers
"
;
import
{
IExtensionService
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
IExtensionService
,
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
@
extHostNamedCustomer
(
MainContext
.
MainThreadMessageService
)
export
class
MainThreadMessageService
implements
MainThreadMessageServiceShape
{
...
...
@@ -33,11 +33,11 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
if
(
options
.
modal
)
{
return
this
.
_showModalMessage
(
severity
,
message
,
commands
);
}
else
{
return
this
.
_showMessage
(
severity
,
message
,
commands
,
options
.
extension
Id
);
return
this
.
_showMessage
(
severity
,
message
,
commands
,
options
.
extension
);
}
}
private
_showMessage
(
severity
:
Severity
,
message
:
string
,
commands
:
{
title
:
string
;
isCloseAffordance
:
boolean
;
handle
:
number
;
}[],
extension
Id
:
string
):
Thenable
<
number
>
{
private
_showMessage
(
severity
:
Severity
,
message
:
string
,
commands
:
{
title
:
string
;
isCloseAffordance
:
boolean
;
handle
:
number
;
}[],
extension
:
IExtensionDescription
):
Thenable
<
number
>
{
return
new
Promise
<
number
>
(
resolve
=>
{
...
...
@@ -72,7 +72,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
messageHide
=
this
.
_messageService
.
show
(
severity
,
{
message
,
actions
,
source
:
extensionId
source
:
`
${
extension
.
name
}
(
${
extension
.
id
}
)`
});
});
}
...
...
src/vs/workbench/api/node/extHost.api.impl.ts
浏览文件 @
c9895288
...
...
@@ -327,13 +327,13 @@ export function createApiFactory(
return
extHostTerminalService
.
onDidCloseTerminal
(
listener
,
thisArg
,
disposables
);
},
showInformationMessage
(
message
,
first
,
...
rest
)
{
return
extHostMessageService
.
showMessage
(
extension
.
id
,
Severity
.
Info
,
message
,
first
,
rest
);
return
extHostMessageService
.
showMessage
(
extension
,
Severity
.
Info
,
message
,
first
,
rest
);
},
showWarningMessage
(
message
,
first
,
...
rest
)
{
return
extHostMessageService
.
showMessage
(
extension
.
id
,
Severity
.
Warning
,
message
,
first
,
rest
);
return
extHostMessageService
.
showMessage
(
extension
,
Severity
.
Warning
,
message
,
first
,
rest
);
},
showErrorMessage
(
message
,
first
,
...
rest
)
{
return
extHostMessageService
.
showMessage
(
extension
.
id
,
Severity
.
Error
,
message
,
first
,
rest
);
return
extHostMessageService
.
showMessage
(
extension
,
Severity
.
Error
,
message
,
first
,
rest
);
},
showQuickPick
(
items
:
any
,
options
:
vscode
.
QuickPickOptions
,
token
?:
vscode
.
CancellationToken
)
{
return
extHostQuickOpen
.
showQuickPick
(
items
,
options
,
token
);
...
...
@@ -368,7 +368,7 @@ export function createApiFactory(
},
// proposed API
sampleFunction
:
proposedApiFunction
(
extension
,
()
=>
{
return
extHostMessageService
.
showMessage
(
extension
.
id
,
Severity
.
Info
,
'
Hello Proposed Api!
'
,
{},
[]);
return
extHostMessageService
.
showMessage
(
extension
,
Severity
.
Info
,
'
Hello Proposed Api!
'
,
{},
[]);
}),
showOpenDialog
:
proposedApiFunction
(
extension
,
()
=>
{
return
extHostDialogs
.
showOpenDialog
();
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
c9895288
...
...
@@ -227,7 +227,7 @@ export interface MainThreadLanguagesShape extends IDisposable {
}
export
interface
MainThreadMessageOptions
{
extension
Id
?:
string
;
extension
?:
IExtensionDescription
;
modal
?:
boolean
;
}
...
...
src/vs/workbench/api/node/extHostMessageService.ts
浏览文件 @
c9895288
...
...
@@ -7,6 +7,7 @@
import
Severity
from
'
vs/base/common/severity
'
;
import
vscode
=
require
(
'
vscode
'
);
import
{
MainContext
,
MainThreadMessageServiceShape
,
MainThreadMessageOptions
,
IMainContext
}
from
'
./extHost.protocol
'
;
import
{
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
function
isMessageItem
<
T
>
(
item
:
any
):
item
is
vscode
.
MessageItem
{
...
...
@@ -21,11 +22,11 @@ export class ExtHostMessageService {
this
.
_proxy
=
mainContext
.
get
(
MainContext
.
MainThreadMessageService
);
}
showMessage
(
extension
Id
:
string
,
severity
:
Severity
,
message
:
string
,
optionsOrFirstItem
:
vscode
.
MessageOptions
|
string
,
rest
:
string
[]):
Thenable
<
string
|
undefined
>
;
showMessage
(
extension
Id
:
string
,
severity
:
Severity
,
message
:
string
,
optionsOrFirstItem
:
vscode
.
MessageOptions
|
vscode
.
MessageItem
,
rest
:
vscode
.
MessageItem
[]):
Thenable
<
vscode
.
MessageItem
|
undefined
>
;
showMessage
(
extension
Id
:
string
,
severity
:
Severity
,
message
:
string
,
optionsOrFirstItem
:
vscode
.
MessageOptions
|
string
|
vscode
.
MessageItem
,
rest
:
(
string
|
vscode
.
MessageItem
)[]):
Thenable
<
string
|
vscode
.
MessageItem
|
undefined
>
{
showMessage
(
extension
:
IExtensionDescription
,
severity
:
Severity
,
message
:
string
,
optionsOrFirstItem
:
vscode
.
MessageOptions
|
string
,
rest
:
string
[]):
Thenable
<
string
|
undefined
>
;
showMessage
(
extension
:
IExtensionDescription
,
severity
:
Severity
,
message
:
string
,
optionsOrFirstItem
:
vscode
.
MessageOptions
|
vscode
.
MessageItem
,
rest
:
vscode
.
MessageItem
[]):
Thenable
<
vscode
.
MessageItem
|
undefined
>
;
showMessage
(
extension
:
IExtensionDescription
,
severity
:
Severity
,
message
:
string
,
optionsOrFirstItem
:
vscode
.
MessageOptions
|
string
|
vscode
.
MessageItem
,
rest
:
(
string
|
vscode
.
MessageItem
)[]):
Thenable
<
string
|
vscode
.
MessageItem
|
undefined
>
{
let
options
:
MainThreadMessageOptions
=
{
extension
Id
};
let
options
:
MainThreadMessageOptions
=
{
extension
};
let
items
:
(
string
|
vscode
.
MessageItem
)[];
if
(
typeof
optionsOrFirstItem
===
'
string
'
||
isMessageItem
(
optionsOrFirstItem
))
{
...
...
src/vs/workbench/services/message/browser/messageList.ts
浏览文件 @
c9895288
...
...
@@ -345,6 +345,8 @@ export class MessageList {
// Hover title
const
title
=
message
.
source
?
`[
${
message
.
source
}
]
${
messageContentElement
.
textContent
}
`
:
messageContentElement
.
textContent
;
sevLabel
.
title
(
title
);
$
(
messageContentElement
as
HTMLElement
).
title
(
title
).
appendTo
(
div
);
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录