Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f820a9a9
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,发现更多精彩内容 >>
提交
f820a9a9
编写于
11月 21, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #83906
上级
f24f4834
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
8 deletion
+6
-8
src/vs/workbench/contrib/debug/browser/repl.ts
src/vs/workbench/contrib/debug/browser/repl.ts
+3
-3
src/vs/workbench/contrib/debug/common/replModel.ts
src/vs/workbench/contrib/debug/common/replModel.ts
+2
-2
src/vs/workbench/contrib/debug/test/browser/debugModel.test.ts
...s/workbench/contrib/debug/test/browser/debugModel.test.ts
+1
-3
未找到文件。
src/vs/workbench/contrib/debug/browser/repl.ts
浏览文件 @
f820a9a9
...
...
@@ -809,13 +809,13 @@ class ReplDelegate extends CachedListVirtualDelegate<IReplElement> {
const
config
=
this
.
configurationService
.
getValue
<
IDebugConfiguration
>
(
'
debug
'
);
if
(
!
config
.
console
.
wordWrap
)
{
return
Math
.
ceil
(
1.4
*
config
.
console
.
fontSiz
e
);
return
this
.
estimateHeight
(
element
,
tru
e
);
}
return
super
.
getHeight
(
element
);
}
protected
estimateHeight
(
element
:
IReplElement
):
number
{
protected
estimateHeight
(
element
:
IReplElement
,
ignoreValueLength
=
false
):
number
{
const
config
=
this
.
configurationService
.
getValue
<
IDebugConfiguration
>
(
'
debug
'
);
const
rowHeight
=
Math
.
ceil
(
1.4
*
config
.
console
.
fontSize
);
const
countNumberOfLines
=
(
str
:
string
)
=>
Math
.
max
(
1
,
(
str
&&
str
.
match
(
/
\r\n
|
\n
/g
)
||
[]).
length
);
...
...
@@ -825,7 +825,7 @@ class ReplDelegate extends CachedListVirtualDelegate<IReplElement> {
// For every 30 characters increase the number of lines needed
if
(
hasValue
(
element
))
{
let
value
=
element
.
value
;
let
valueRows
=
countNumberOfLines
(
value
)
+
Math
.
floor
(
value
.
length
/
30
);
let
valueRows
=
countNumberOfLines
(
value
)
+
(
ignoreValueLength
?
0
:
Math
.
floor
(
value
.
length
/
30
)
);
return
valueRows
*
rowHeight
;
}
...
...
src/vs/workbench/contrib/debug/common/replModel.ts
浏览文件 @
f820a9a9
...
...
@@ -10,7 +10,7 @@ import { ExpressionContainer } from 'vs/workbench/contrib/debug/common/debugMode
import
{
isString
,
isUndefinedOrNull
,
isObject
}
from
'
vs/base/common/types
'
;
import
{
basenameOrAuthority
}
from
'
vs/base/common/resources
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
endsWith
,
startsWith
}
from
'
vs/base/common/strings
'
;
import
{
endsWith
}
from
'
vs/base/common/strings
'
;
import
{
generateUuid
}
from
'
vs/base/common/uuid
'
;
import
{
Emitter
}
from
'
vs/base/common/event
'
;
...
...
@@ -134,7 +134,7 @@ export class ReplModel {
if
(
typeof
data
===
'
string
'
)
{
const
previousElement
=
this
.
replElements
.
length
?
this
.
replElements
[
this
.
replElements
.
length
-
1
]
:
undefined
;
if
(
!
startsWith
(
data
,
'
\n
'
)
&&
previousElement
instanceof
SimpleReplElement
&&
previousElement
.
severity
===
sev
&&
!
endsWith
(
previousElement
.
value
,
'
\n
'
)
&&
!
endsWith
(
previousElement
.
value
,
'
\r\n
'
))
{
if
(
previousElement
instanceof
SimpleReplElement
&&
previousElement
.
severity
===
sev
&&
!
endsWith
(
previousElement
.
value
,
'
\n
'
)
&&
!
endsWith
(
previousElement
.
value
,
'
\r\n
'
))
{
previousElement
.
value
+=
data
;
this
.
_onDidChangeElements
.
fire
();
}
else
{
...
...
src/vs/workbench/contrib/debug/test/browser/debugModel.test.ts
浏览文件 @
f820a9a9
...
...
@@ -498,13 +498,11 @@ suite('Debug - Model', () => {
repl
.
appendToRepl
(
session
,
'
3
\n
4
'
,
severity
.
Info
);
repl
.
appendToRepl
(
session
,
'
5
\n
'
,
severity
.
Info
);
repl
.
appendToRepl
(
session
,
'
6
'
,
severity
.
Info
);
repl
.
appendToRepl
(
session
,
'
\n
7
'
,
severity
.
Info
);
elements
=
<
SimpleReplElement
[]
>
repl
.
getReplElements
();
assert
.
equal
(
elements
.
length
,
4
);
assert
.
equal
(
elements
.
length
,
3
);
assert
.
equal
(
elements
[
0
],
'
1
\n
'
);
assert
.
equal
(
elements
[
1
],
'
23
\n
45
\n
'
);
assert
.
equal
(
elements
[
2
],
'
6
'
);
assert
.
equal
(
elements
[
3
],
'
\n
7
'
);
});
test
(
'
repl merging
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录