Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
34bf3d97
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,发现更多精彩内容 >>
提交
34bf3d97
编写于
11月 11, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use LogService in extHostDiagnostics, #84283
上级
41dd4021
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
7 deletion
+9
-7
src/vs/workbench/api/common/extHost.api.impl.ts
src/vs/workbench/api/common/extHost.api.impl.ts
+1
-1
src/vs/workbench/api/common/extHostDiagnostics.ts
src/vs/workbench/api/common/extHostDiagnostics.ts
+3
-2
src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
...ench/test/electron-browser/api/extHostApiCommands.test.ts
+1
-1
src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts
...ench/test/electron-browser/api/extHostDiagnostics.test.ts
+3
-2
src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
...test/electron-browser/api/extHostLanguageFeatures.test.ts
+1
-1
未找到文件。
src/vs/workbench/api/common/extHost.api.impl.ts
浏览文件 @
34bf3d97
...
@@ -113,7 +113,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
...
@@ -113,7 +113,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
const
extHostEditors
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostEditors
,
new
ExtHostEditors
(
rpcProtocol
,
extHostDocumentsAndEditors
));
const
extHostEditors
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostEditors
,
new
ExtHostEditors
(
rpcProtocol
,
extHostDocumentsAndEditors
));
const
extHostTreeViews
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostTreeViews
,
new
ExtHostTreeViews
(
rpcProtocol
.
getProxy
(
MainContext
.
MainThreadTreeViews
),
extHostCommands
,
extHostLogService
));
const
extHostTreeViews
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostTreeViews
,
new
ExtHostTreeViews
(
rpcProtocol
.
getProxy
(
MainContext
.
MainThreadTreeViews
),
extHostCommands
,
extHostLogService
));
const
extHostEditorInsets
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostEditorInsets
,
new
ExtHostEditorInsets
(
rpcProtocol
.
getProxy
(
MainContext
.
MainThreadEditorInsets
),
extHostEditors
,
initData
.
environment
));
const
extHostEditorInsets
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostEditorInsets
,
new
ExtHostEditorInsets
(
rpcProtocol
.
getProxy
(
MainContext
.
MainThreadEditorInsets
),
extHostEditors
,
initData
.
environment
));
const
extHostDiagnostics
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostDiagnostics
,
new
ExtHostDiagnostics
(
rpcProtocol
));
const
extHostDiagnostics
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostDiagnostics
,
new
ExtHostDiagnostics
(
rpcProtocol
,
extHostLogService
));
const
extHostLanguageFeatures
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostLanguageFeatures
,
new
ExtHostLanguageFeatures
(
rpcProtocol
,
uriTransformer
,
extHostDocuments
,
extHostCommands
,
extHostDiagnostics
,
extHostLogService
));
const
extHostLanguageFeatures
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostLanguageFeatures
,
new
ExtHostLanguageFeatures
(
rpcProtocol
,
uriTransformer
,
extHostDocuments
,
extHostCommands
,
extHostDiagnostics
,
extHostLogService
));
const
extHostFileSystem
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostFileSystem
,
new
ExtHostFileSystem
(
rpcProtocol
,
extHostLanguageFeatures
));
const
extHostFileSystem
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostFileSystem
,
new
ExtHostFileSystem
(
rpcProtocol
,
extHostLanguageFeatures
));
const
extHostFileSystemEvent
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostFileSystemEventService
,
new
ExtHostFileSystemEventService
(
rpcProtocol
,
extHostDocumentsAndEditors
));
const
extHostFileSystemEvent
=
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostFileSystemEventService
,
new
ExtHostFileSystemEventService
(
rpcProtocol
,
extHostDocumentsAndEditors
));
...
...
src/vs/workbench/api/common/extHostDiagnostics.ts
浏览文件 @
34bf3d97
...
@@ -13,6 +13,7 @@ import * as converter from './extHostTypeConverters';
...
@@ -13,6 +13,7 @@ import * as converter from './extHostTypeConverters';
import
{
mergeSort
}
from
'
vs/base/common/arrays
'
;
import
{
mergeSort
}
from
'
vs/base/common/arrays
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
keys
}
from
'
vs/base/common/map
'
;
import
{
keys
}
from
'
vs/base/common/map
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
export
class
DiagnosticCollection
implements
vscode
.
DiagnosticCollection
{
export
class
DiagnosticCollection
implements
vscode
.
DiagnosticCollection
{
...
@@ -253,7 +254,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
...
@@ -253,7 +254,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
readonly
onDidChangeDiagnostics
:
Event
<
vscode
.
DiagnosticChangeEvent
>
=
Event
.
map
(
Event
.
debounce
(
this
.
_onDidChangeDiagnostics
.
event
,
ExtHostDiagnostics
.
_debouncer
,
50
),
ExtHostDiagnostics
.
_mapper
);
readonly
onDidChangeDiagnostics
:
Event
<
vscode
.
DiagnosticChangeEvent
>
=
Event
.
map
(
Event
.
debounce
(
this
.
_onDidChangeDiagnostics
.
event
,
ExtHostDiagnostics
.
_debouncer
,
50
),
ExtHostDiagnostics
.
_mapper
);
constructor
(
mainContext
:
IMainContext
)
{
constructor
(
mainContext
:
IMainContext
,
@
ILogService
private
readonly
_logService
:
ILogService
)
{
this
.
_proxy
=
mainContext
.
getProxy
(
MainContext
.
MainThreadDiagnostics
);
this
.
_proxy
=
mainContext
.
getProxy
(
MainContext
.
MainThreadDiagnostics
);
}
}
...
@@ -266,7 +267,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
...
@@ -266,7 +267,7 @@ export class ExtHostDiagnostics implements ExtHostDiagnosticsShape {
}
else
if
(
!
_collections
.
has
(
name
))
{
}
else
if
(
!
_collections
.
has
(
name
))
{
owner
=
name
;
owner
=
name
;
}
else
{
}
else
{
consol
e
.
warn
(
`DiagnosticCollection with name '
${
name
}
' does already exist.`
);
this
.
_logServic
e
.
warn
(
`DiagnosticCollection with name '
${
name
}
' does already exist.`
);
do
{
do
{
owner
=
name
+
ExtHostDiagnostics
.
_idPool
++
;
owner
=
name
+
ExtHostDiagnostics
.
_idPool
++
;
}
while
(
_collections
.
has
(
owner
));
}
while
(
_collections
.
has
(
owner
));
...
...
src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts
浏览文件 @
34bf3d97
...
@@ -112,7 +112,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
...
@@ -112,7 +112,7 @@ suite('ExtHostLanguageFeatureCommands', function () {
rpcProtocol
.
set
(
MainContext
.
MainThreadCommands
,
inst
.
createInstance
(
MainThreadCommands
,
rpcProtocol
));
rpcProtocol
.
set
(
MainContext
.
MainThreadCommands
,
inst
.
createInstance
(
MainThreadCommands
,
rpcProtocol
));
ExtHostApiCommands
.
register
(
commands
);
ExtHostApiCommands
.
register
(
commands
);
const
diagnostics
=
new
ExtHostDiagnostics
(
rpcProtocol
);
const
diagnostics
=
new
ExtHostDiagnostics
(
rpcProtocol
,
new
NullLogService
()
);
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostDiagnostics
,
diagnostics
);
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostDiagnostics
,
diagnostics
);
extHost
=
new
ExtHostLanguageFeatures
(
rpcProtocol
,
null
,
extHostDocuments
,
commands
,
diagnostics
,
new
NullLogService
());
extHost
=
new
ExtHostLanguageFeatures
(
rpcProtocol
,
null
,
extHostDocuments
,
commands
,
diagnostics
,
new
NullLogService
());
...
...
src/vs/workbench/test/electron-browser/api/extHostDiagnostics.test.ts
浏览文件 @
34bf3d97
...
@@ -11,6 +11,7 @@ import { MainThreadDiagnosticsShape, IMainContext } from 'vs/workbench/api/commo
...
@@ -11,6 +11,7 @@ import { MainThreadDiagnosticsShape, IMainContext } from 'vs/workbench/api/commo
import
{
IMarkerData
,
MarkerSeverity
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IMarkerData
,
MarkerSeverity
}
from
'
vs/platform/markers/common/markers
'
;
import
{
mock
}
from
'
vs/workbench/test/electron-browser/api/mock
'
;
import
{
mock
}
from
'
vs/workbench/test/electron-browser/api/mock
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
NullLogService
}
from
'
vs/platform/log/common/log
'
;
suite
(
'
ExtHostDiagnostics
'
,
()
=>
{
suite
(
'
ExtHostDiagnostics
'
,
()
=>
{
...
@@ -387,7 +388,7 @@ suite('ExtHostDiagnostics', () => {
...
@@ -387,7 +388,7 @@ suite('ExtHostDiagnostics', () => {
assertRegistered
():
void
{
assertRegistered
():
void
{
}
}
});
}
,
new
NullLogService
()
);
let
collection1
=
diags
.
createDiagnosticCollection
(
'
foo
'
);
let
collection1
=
diags
.
createDiagnosticCollection
(
'
foo
'
);
let
collection2
=
diags
.
createDiagnosticCollection
(
'
foo
'
);
// warns, uses a different owner
let
collection2
=
diags
.
createDiagnosticCollection
(
'
foo
'
);
// warns, uses a different owner
...
@@ -436,7 +437,7 @@ suite('ExtHostDiagnostics', () => {
...
@@ -436,7 +437,7 @@ suite('ExtHostDiagnostics', () => {
assertRegistered
():
void
{
assertRegistered
():
void
{
}
}
});
}
,
new
NullLogService
()
);
//
//
...
...
src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
浏览文件 @
34bf3d97
...
@@ -102,7 +102,7 @@ suite('ExtHostLanguageFeatures', function () {
...
@@ -102,7 +102,7 @@ suite('ExtHostLanguageFeatures', function () {
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostCommands
,
commands
);
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostCommands
,
commands
);
rpcProtocol
.
set
(
MainContext
.
MainThreadCommands
,
inst
.
createInstance
(
MainThreadCommands
,
rpcProtocol
));
rpcProtocol
.
set
(
MainContext
.
MainThreadCommands
,
inst
.
createInstance
(
MainThreadCommands
,
rpcProtocol
));
const
diagnostics
=
new
ExtHostDiagnostics
(
rpcProtocol
);
const
diagnostics
=
new
ExtHostDiagnostics
(
rpcProtocol
,
new
NullLogService
()
);
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostDiagnostics
,
diagnostics
);
rpcProtocol
.
set
(
ExtHostContext
.
ExtHostDiagnostics
,
diagnostics
);
extHost
=
new
ExtHostLanguageFeatures
(
rpcProtocol
,
null
,
extHostDocuments
,
commands
,
diagnostics
,
new
NullLogService
());
extHost
=
new
ExtHostLanguageFeatures
(
rpcProtocol
,
null
,
extHostDocuments
,
commands
,
diagnostics
,
new
NullLogService
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录