Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
945f4bad
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,发现更多精彩内容 >>
提交
945f4bad
编写于
5月 25, 2018
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add fallback to editor.fontFamily tests
上级
f0f87ca4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
5 deletion
+51
-5
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
...h/parts/terminal/electron-browser/terminalConfigHelper.ts
+0
-2
src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
...rminal/test/electron-browser/terminalConfigHelper.test.ts
+51
-3
未找到文件。
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
浏览文件 @
945f4bad
...
...
@@ -56,8 +56,6 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
let
fontFamily
=
this
.
config
.
fontFamily
||
editorConfig
.
fontFamily
;
let
i_rect
=
this
.
_getBoundingRectFor
(
'
i
'
,
fontFamily
,
fontSize
);
let
w_rect
=
this
.
_getBoundingRectFor
(
'
w
'
,
fontFamily
,
fontSize
);
console
.
log
(
'
i_rect.width:
'
+
i_rect
.
width
);
console
.
log
(
'
w_rect.width:
'
+
w_rect
.
width
);
let
invalidBounds
=
!
i_rect
.
width
||
!
w_rect
.
width
;
if
(
invalidBounds
)
{
...
...
src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
浏览文件 @
945f4bad
...
...
@@ -136,7 +136,7 @@ suite('Workbench - TerminalConfigHelper', () => {
let
configHelper
=
new
TerminalConfigHelper
(
configurationService
,
null
,
null
,
null
);
configHelper
.
panelContainer
=
fixture
;
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
true
,
'
Monospace is mono-
spaced
'
);
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
true
,
'
monospace is mono
spaced
'
);
});
test
(
'
TerminalConfigHelper - isMonospace sans-serif
'
,
function
()
{
...
...
@@ -148,7 +148,7 @@ suite('Workbench - TerminalConfigHelper', () => {
});
let
configHelper
=
new
TerminalConfigHelper
(
configurationService
,
null
,
null
,
null
);
configHelper
.
panelContainer
=
fixture
;
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
false
,
'
sans-serif is not mono
-
spaced
'
);
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
false
,
'
sans-serif is not monospaced
'
);
});
test
(
'
TerminalConfigHelper - isMonospace serif
'
,
function
()
{
...
...
@@ -160,6 +160,54 @@ suite('Workbench - TerminalConfigHelper', () => {
});
let
configHelper
=
new
TerminalConfigHelper
(
configurationService
,
null
,
null
,
null
);
configHelper
.
panelContainer
=
fixture
;
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
false
,
'
serif is not mono-spaced
'
);
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
false
,
'
serif is not monospaced
'
);
});
test
(
'
TerminalConfigHelper - isMonospace monospace falls back to editor.fontFamily
'
,
function
()
{
const
configurationService
=
new
TestConfigurationService
();
configurationService
.
setUserConfiguration
(
'
editor
'
,
{
fontFamily
:
'
monospace
'
});
configurationService
.
setUserConfiguration
(
'
terminal
'
,
{
integrated
:
{
fontFamily
:
null
}
});
let
configHelper
=
new
TerminalConfigHelper
(
configurationService
,
null
,
null
,
null
);
configHelper
.
panelContainer
=
fixture
;
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
true
,
'
monospace is monospaced
'
);
});
test
(
'
TerminalConfigHelper - isMonospace sans-serif falls back to editor.fontFamily
'
,
function
()
{
const
configurationService
=
new
TestConfigurationService
();
configurationService
.
setUserConfiguration
(
'
editor
'
,
{
fontFamily
:
'
sans-serif
'
});
configurationService
.
setUserConfiguration
(
'
terminal
'
,
{
integrated
:
{
fontFamily
:
null
}
});
let
configHelper
=
new
TerminalConfigHelper
(
configurationService
,
null
,
null
,
null
);
configHelper
.
panelContainer
=
fixture
;
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
false
,
'
sans-serif is not monospaced
'
);
});
test
(
'
TerminalConfigHelper - isMonospace serif falls back to editor.fontFamily
'
,
function
()
{
const
configurationService
=
new
TestConfigurationService
();
configurationService
.
setUserConfiguration
(
'
editor
'
,
{
fontFamily
:
'
serif
'
});
configurationService
.
setUserConfiguration
(
'
terminal
'
,
{
integrated
:
{
fontFamily
:
null
}
});
let
configHelper
=
new
TerminalConfigHelper
(
configurationService
,
null
,
null
,
null
);
configHelper
.
panelContainer
=
fixture
;
assert
.
equal
(
configHelper
.
configFontIsMonospace
(),
false
,
'
serif is not monospaced
'
);
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录