Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a781a325
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,发现更多精彩内容 >>
提交
a781a325
编写于
9月 19, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
do not assume folders[0] is there
上级
8d161606
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
5 deletion
+6
-5
src/vs/workbench/parts/debug/browser/linkDetector.ts
src/vs/workbench/parts/debug/browser/linkDetector.ts
+1
-1
src/vs/workbench/services/configuration/node/configuration.ts
...vs/workbench/services/configuration/node/configuration.ts
+1
-1
src/vs/workbench/services/history/browser/history.ts
src/vs/workbench/services/history/browser/history.ts
+4
-3
未找到文件。
src/vs/workbench/parts/debug/browser/linkDetector.ts
浏览文件 @
a781a325
...
...
@@ -37,6 +37,7 @@ export class LinkDetector {
* If no links were detected, returns the original string.
*/
public
handleLinks
(
text
:
string
):
HTMLElement
|
string
{
const
workspaceFolder
=
this
.
contextService
.
getWorkspace
().
folders
[
0
];
let
linkContainer
:
HTMLElement
;
for
(
let
pattern
of
LinkDetector
.
FILE_LOCATION_PATTERNS
)
{
...
...
@@ -46,7 +47,6 @@ export class LinkDetector {
let
match
=
pattern
.
exec
(
text
);
while
(
match
!==
null
)
{
let
resource
:
uri
=
null
;
const
workspaceFolder
=
this
.
contextService
.
getWorkspace
().
folders
[
0
];
if
(
workspaceFolder
)
{
try
{
resource
=
(
match
&&
!
strings
.
startsWith
(
match
[
0
],
'
http
'
))
...
...
src/vs/workbench/services/configuration/node/configuration.ts
浏览文件 @
a781a325
...
...
@@ -555,7 +555,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
if
(
this
.
getWorkbenchState
()
===
WorkbenchState
.
EMPTY
)
{
this
.
_onDidUpdateConfiguration
.
fire
({
source
:
ConfigurationSource
.
User
,
sourceConfig
:
this
.
_configuration
.
user
.
contents
});
}
else
{
this
.
_onDidUpdateConfiguration
.
fire
({
source
:
ConfigurationSource
.
Workspace
,
sourceConfig
:
this
.
_configuration
.
getFolderConfigurationModel
(
this
.
workspace
.
folders
[
0
].
uri
).
contents
});
this
.
_onDidUpdateConfiguration
.
fire
({
source
:
ConfigurationSource
.
Workspace
,
sourceConfig
:
this
.
workspace
.
folders
.
length
?
this
.
_configuration
.
getFolderConfigurationModel
(
this
.
workspace
.
folders
[
0
].
uri
).
contents
:
void
0
});
// TODO@Sandeep debt?
}
}
...
...
src/vs/workbench/services/history/browser/history.ts
浏览文件 @
a781a325
...
...
@@ -15,7 +15,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
import
{
IHistoryService
}
from
'
vs/workbench/services/history/common/history
'
;
import
{
FileChangesEvent
,
IFileService
,
FileChangeType
}
from
'
vs/platform/files/common/files
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
ILifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
...
...
@@ -766,7 +766,8 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
}
public
getLastActiveWorkspaceRoot
():
URI
{
if
(
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
EMPTY
)
{
const
folders
=
this
.
contextService
.
getWorkspace
().
folders
;
if
(
folders
.
length
===
0
)
{
return
void
0
;
}
...
...
@@ -785,6 +786,6 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic
}
// fallback to first workspace
return
this
.
contextService
.
getWorkspace
().
folders
[
0
].
uri
;
return
folders
[
0
].
uri
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录