Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
9be22498
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,发现更多精彩内容 >>
提交
9be22498
编写于
12月 06, 2018
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make LogLevel converters safer and consistent with other converters, from @jrieken feedback
上级
b2e8dcc4
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
59 addition
and
9 deletion
+59
-9
src/vs/workbench/api/node/extHost.api.impl.ts
src/vs/workbench/api/node/extHost.api.impl.ts
+2
-2
src/vs/workbench/api/node/extHostTypeConverters.ts
src/vs/workbench/api/node/extHostTypeConverters.ts
+44
-6
src/vs/workbench/test/electron-browser/api/extHostTypeConverter.test.ts
...ch/test/electron-browser/api/extHostTypeConverter.test.ts
+13
-1
未找到文件。
src/vs/workbench/api/node/extHost.api.impl.ts
浏览文件 @
9be22498
...
...
@@ -246,11 +246,11 @@ export function createApiFactory(
get
appRoot
()
{
return
initData
.
environment
.
appRoot
.
fsPath
;
},
get
logLevel
()
{
checkProposedApiEnabled
(
extension
);
return
typeConverters
.
LogLevel
.
fromMainLogLevel
(
extHostLogService
.
getLevel
());
return
typeConverters
.
LogLevel
.
to
(
extHostLogService
.
getLevel
());
},
get
onDidChangeLogLevel
()
{
checkProposedApiEnabled
(
extension
);
return
mapEvent
(
extHostLogService
.
onDidChangeLogLevel
,
l
=>
typeConverters
.
LogLevel
.
fromMainLogLevel
(
l
));
return
mapEvent
(
extHostLogService
.
onDidChangeLogLevel
,
l
=>
typeConverters
.
LogLevel
.
to
(
l
));
},
get
clipboard
():
vscode
.
Clipboard
{
return
extHostClipboard
;
...
...
src/vs/workbench/api/node/extHostTypeConverters.ts
浏览文件 @
9be22498
...
...
@@ -970,11 +970,49 @@ export namespace LanguageSelector {
}
export
namespace
LogLevel
{
export
function
fromMainLogLevel
(
mainLevel
:
_MainLogLevel
):
types
.
LogLevel
{
return
mainLevel
+
1
;
}
export
function
toMainLogLevel
(
extLevel
:
types
.
LogLevel
):
_MainLogLevel
{
return
extLevel
-
1
;
export
function
from
(
extLevel
:
types
.
LogLevel
):
_MainLogLevel
{
switch
(
extLevel
)
{
case
types
.
LogLevel
.
Trace
:
return
_MainLogLevel
.
Trace
;
case
types
.
LogLevel
.
Debug
:
return
_MainLogLevel
.
Debug
;
case
types
.
LogLevel
.
Info
:
return
_MainLogLevel
.
Info
;
case
types
.
LogLevel
.
Warning
:
return
_MainLogLevel
.
Warning
;
case
types
.
LogLevel
.
Error
:
return
_MainLogLevel
.
Error
;
case
types
.
LogLevel
.
Critical
:
return
_MainLogLevel
.
Critical
;
case
types
.
LogLevel
.
Critical
:
return
_MainLogLevel
.
Critical
;
case
types
.
LogLevel
.
Off
:
return
_MainLogLevel
.
Off
;
}
return
_MainLogLevel
.
Info
;
}
export
function
to
(
mainLevel
:
_MainLogLevel
):
types
.
LogLevel
{
switch
(
mainLevel
)
{
case
_MainLogLevel
.
Trace
:
return
types
.
LogLevel
.
Trace
;
case
_MainLogLevel
.
Debug
:
return
types
.
LogLevel
.
Debug
;
case
_MainLogLevel
.
Info
:
return
types
.
LogLevel
.
Info
;
case
_MainLogLevel
.
Warning
:
return
types
.
LogLevel
.
Warning
;
case
_MainLogLevel
.
Error
:
return
types
.
LogLevel
.
Error
;
case
_MainLogLevel
.
Critical
:
return
types
.
LogLevel
.
Critical
;
case
_MainLogLevel
.
Critical
:
return
types
.
LogLevel
.
Critical
;
case
_MainLogLevel
.
Off
:
return
types
.
LogLevel
.
Off
;
}
return
types
.
LogLevel
.
Info
;
}
}
src/vs/workbench/test/electron-browser/api/extHostTypeConverter.test.ts
浏览文件 @
9be22498
...
...
@@ -5,9 +5,11 @@
import
*
as
assert
from
'
assert
'
;
import
{
MarkdownString
}
from
'
vs/workbench/api/node/extHostTypeConverters
'
;
import
{
MarkdownString
,
LogLevel
}
from
'
vs/workbench/api/node/extHostTypeConverters
'
;
import
{
isEmptyObject
}
from
'
vs/base/common/types
'
;
import
{
size
}
from
'
vs/base/common/collections
'
;
import
*
as
types
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
LogLevel
as
_MainLogLevel
}
from
'
vs/platform/log/common/log
'
;
suite
(
'
ExtHostTypeConverter
'
,
function
()
{
...
...
@@ -56,4 +58,14 @@ suite('ExtHostTypeConverter', function () {
assert
.
ok
(
!!
data
.
uris
[
'
file:///somepath/here
'
]);
assert
.
ok
(
!!
data
.
uris
[
'
file:///somepath/here2
'
]);
});
test
(
'
LogLevel
'
,
()
=>
{
assert
.
equal
(
LogLevel
.
from
(
types
.
LogLevel
.
Error
),
_MainLogLevel
.
Error
);
assert
.
equal
(
LogLevel
.
from
(
types
.
LogLevel
.
Info
),
_MainLogLevel
.
Info
);
assert
.
equal
(
LogLevel
.
from
(
types
.
LogLevel
.
Off
),
_MainLogLevel
.
Off
);
assert
.
equal
(
LogLevel
.
to
(
_MainLogLevel
.
Error
),
types
.
LogLevel
.
Error
);
assert
.
equal
(
LogLevel
.
to
(
_MainLogLevel
.
Info
),
types
.
LogLevel
.
Info
);
assert
.
equal
(
LogLevel
.
to
(
_MainLogLevel
.
Off
),
types
.
LogLevel
.
Off
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录