Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c99654e0
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,发现更多精彩内容 >>
提交
c99654e0
编写于
7月 26, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: adopt uri display service
上级
db9ce80b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
18 deletion
+11
-18
src/vs/platform/uriDisplay/common/uriDisplay.ts
src/vs/platform/uriDisplay/common/uriDisplay.ts
+1
-1
src/vs/workbench/parts/debug/browser/breakpointsView.ts
src/vs/workbench/parts/debug/browser/breakpointsView.ts
+4
-8
src/vs/workbench/parts/debug/electron-browser/callStackView.ts
...s/workbench/parts/debug/electron-browser/callStackView.ts
+3
-5
src/vs/workbench/parts/debug/electron-browser/replViewer.ts
src/vs/workbench/parts/debug/electron-browser/replViewer.ts
+3
-4
未找到文件。
src/vs/platform/uriDisplay/common/uriDisplay.ts
浏览文件 @
c99654e0
...
...
@@ -16,7 +16,7 @@ import { ltrim } from 'vs/base/common/strings';
export
interface
IUriDisplayService
{
_serviceBrand
:
any
;
getLabel
(
resource
:
URI
,
relative
:
boolean
):
string
;
getLabel
(
resource
:
URI
,
relative
?
:
boolean
):
string
;
registerFormater
(
schema
:
string
,
formater
:
UriDisplayRules
):
IDisposable
;
}
...
...
src/vs/workbench/parts/debug/browser/breakpointsView.ts
浏览文件 @
c99654e0
...
...
@@ -16,11 +16,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
Constants
}
from
'
vs/editor/common/core/uint
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
dispose
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
basename
}
from
'
vs/base/common/paths
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
IVirtualDelegate
,
IListContextMenuEvent
,
IRenderer
}
from
'
vs/base/browser/ui/list/list
'
;
...
...
@@ -36,6 +32,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
{
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
IEditorService
,
SIDE_GROUP
,
ACTIVE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ViewletPanel
,
IViewletPanelOptions
}
from
'
vs/workbench/browser/parts/views/panelViewlet
'
;
import
{
IUriDisplayService
}
from
'
vs/platform/uriDisplay/common/uriDisplay
'
;
const
$
=
dom
.
$
;
...
...
@@ -287,8 +284,7 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
constructor
(
@
IDebugService
private
debugService
:
IDebugService
,
@
IWorkspaceContextService
private
contextService
:
IWorkspaceContextService
,
@
IEnvironmentService
private
environmentService
:
IEnvironmentService
,
@
IUriDisplayService
private
uriDisplayService
:
IUriDisplayService
,
@
ITextFileService
private
textFileService
:
ITextFileService
)
{
// noop
...
...
@@ -327,12 +323,12 @@ class BreakpointsRenderer implements IRenderer<IBreakpoint, IBreakpointTemplateD
data
.
context
=
breakpoint
;
dom
.
toggleClass
(
data
.
breakpoint
,
'
disabled
'
,
!
this
.
debugService
.
getModel
().
areBreakpointsActivated
());
data
.
name
.
textContent
=
basename
(
getPathLabel
(
breakpoint
.
uri
,
this
.
environmentService
,
this
.
contextService
)
);
data
.
name
.
textContent
=
resources
.
basenameOrAuthority
(
breakpoint
.
uri
);
data
.
lineNumber
.
textContent
=
breakpoint
.
lineNumber
.
toString
();
if
(
breakpoint
.
column
)
{
data
.
lineNumber
.
textContent
+=
`:
${
breakpoint
.
column
}
`
;
}
data
.
filePath
.
textContent
=
getPathLabel
(
resources
.
dirname
(
breakpoint
.
uri
),
this
.
environmentService
,
this
.
contextServic
e
);
data
.
filePath
.
textContent
=
this
.
uriDisplayService
.
getLabel
(
resources
.
dirname
(
breakpoint
.
uri
),
tru
e
);
data
.
checkbox
.
checked
=
breakpoint
.
enabled
;
const
{
message
,
className
}
=
getBreakpointMessageAndClassName
(
this
.
debugService
,
this
.
textFileService
,
breakpoint
);
...
...
src/vs/workbench/parts/debug/electron-browser/callStackView.ts
浏览文件 @
c99654e0
...
...
@@ -27,8 +27,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
{
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
IContextKey
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IViewletPanelOptions
}
from
'
vs/workbench/browser/parts/views/panelViewlet
'
;
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IUriDisplayService
}
from
'
vs/platform/uriDisplay/common/uriDisplay
'
;
const
$
=
dom
.
$
;
...
...
@@ -399,7 +398,7 @@ class CallStackRenderer implements IRenderer {
constructor
(
@
IWorkspaceContextService
private
contextService
:
IWorkspaceContextService
,
@
I
EnvironmentService
private
environmentService
:
IEnvironment
Service
@
I
UriDisplayService
private
uriDisplayService
:
IUriDisplay
Service
)
{
// noop
}
...
...
@@ -518,8 +517,7 @@ class CallStackRenderer implements IRenderer {
dom
.
toggleClass
(
data
.
stackFrame
,
'
label
'
,
stackFrame
.
presentationHint
===
'
label
'
);
dom
.
toggleClass
(
data
.
stackFrame
,
'
subtle
'
,
stackFrame
.
presentationHint
===
'
subtle
'
);
const
path
=
stackFrame
.
source
.
raw
.
path
||
stackFrame
.
source
.
name
;
data
.
file
.
title
=
getPathLabel
(
path
,
this
.
environmentService
);
data
.
file
.
title
=
stackFrame
.
source
.
inMemory
?
stackFrame
.
source
.
name
:
this
.
uriDisplayService
.
getLabel
(
stackFrame
.
source
.
uri
);
if
(
stackFrame
.
source
.
raw
.
origin
)
{
data
.
file
.
title
+=
`\n
${
stackFrame
.
source
.
raw
.
origin
}
`
;
}
...
...
src/vs/workbench/parts/debug/electron-browser/replViewer.ts
浏览文件 @
c99654e0
...
...
@@ -24,8 +24,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
LinkDetector
}
from
'
vs/workbench/parts/debug/browser/linkDetector
'
;
import
{
handleANSIOutput
}
from
'
vs/workbench/parts/debug/browser/debugANSIHandling
'
;
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IUriDisplayService
}
from
'
vs/platform/uriDisplay/common/uriDisplay
'
;
const
$
=
dom
.
$
;
...
...
@@ -98,7 +97,7 @@ export class ReplExpressionsRenderer implements IRenderer {
constructor
(
@
IEditorService
private
editorService
:
IEditorService
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
I
EnvironmentService
private
environmentService
:
IEnvironment
Service
@
I
UriDisplayService
private
uriDisplayService
:
IUriDisplay
Service
)
{
this
.
linkDetector
=
this
.
instantiationService
.
createInstance
(
LinkDetector
);
}
...
...
@@ -261,7 +260,7 @@ export class ReplExpressionsRenderer implements IRenderer {
dom
.
addClass
(
templateData
.
value
,
(
element
.
severity
===
severity
.
Warning
)
?
'
warn
'
:
(
element
.
severity
===
severity
.
Error
)
?
'
error
'
:
(
element
.
severity
===
severity
.
Ignore
)
?
'
ignore
'
:
'
info
'
);
templateData
.
source
.
textContent
=
element
.
sourceData
?
`
${
element
.
sourceData
.
source
.
name
}
:
${
element
.
sourceData
.
lineNumber
}
`
:
''
;
templateData
.
source
.
title
=
element
.
sourceData
?
getPathLabel
(
element
.
sourceData
.
source
.
uri
,
this
.
environmentService
)
:
''
;
templateData
.
source
.
title
=
element
.
sourceData
?
this
.
uriDisplayService
.
getLabel
(
element
.
sourceData
.
source
.
uri
)
:
''
;
templateData
.
getReplElementSource
=
()
=>
element
.
sourceData
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录