Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
850396fe
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,发现更多精彩内容 >>
提交
850396fe
编写于
7月 22, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update comments
上级
3acf1428
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
6 deletion
+3
-6
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+2
-2
src/vs/workbench/parts/files/electron-browser/fileCommands.ts
...vs/workbench/parts/files/electron-browser/fileCommands.ts
+1
-2
src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
...kbench/parts/files/electron-browser/views/explorerView.ts
+0
-1
src/vs/workbench/parts/search/common/queryBuilder.ts
src/vs/workbench/parts/search/common/queryBuilder.ts
+0
-1
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
850396fe
...
...
@@ -546,7 +546,7 @@ export class WindowsManager implements IWindowsMainService {
// Special case: we started with --wait and we got back a folder to open. In this case
// we actually prefer to not open the folder but operate purely on the file.
if
(
typeof
bestWindowOrFolder
===
'
string
'
&&
filesToWait
)
{
//TODO:Ben This should not happen
//TODO:
#54483
Ben This should not happen
console
.
error
(
`This should not happen`
,
bestWindowOrFolder
,
WindowsManager
.
WINDOWS
);
bestWindowOrFolder
=
!
openFilesInNewWindow
?
this
.
getLastActiveWindow
()
:
null
;
}
...
...
@@ -580,7 +580,7 @@ export class WindowsManager implements IWindowsMainService {
// We found a suitable folder to open: add it to foldersToOpen
else
if
(
typeof
bestWindowOrFolder
===
'
string
'
)
{
//TODO:Ben This should not happen
//TODO:
#54483
Ben This should not happen
// foldersToOpen.push(bestWindowOrFolder);
console
.
error
(
`This should not happen`
,
bestWindowOrFolder
,
WindowsManager
.
WINDOWS
);
}
...
...
src/vs/workbench/parts/files/electron-browser/fileCommands.ts
浏览文件 @
850396fe
...
...
@@ -79,7 +79,7 @@ export const ResourceSelectedForCompareContext = new RawContextKey<boolean>('res
export
const
REMOVE_ROOT_FOLDER_COMMAND_ID
=
'
removeRootFolder
'
;
export
const
REMOVE_ROOT_FOLDER_LABEL
=
nls
.
localize
(
'
removeFolderFromWorkspace
'
,
"
Remove Folder from Workspace
"
);
//
support string paths for backward compatibility. TODO @bpasero
remove if not necessary
//
TODO #54483 support string paths for backward compatibility. check with @bpasero and
remove if not necessary
export
const
openWindowCommand
=
(
accessor
:
ServicesAccessor
,
paths
:
(
string
|
URI
)[],
forceNewWindow
:
boolean
)
=>
{
const
windowService
=
accessor
.
get
(
IWindowService
);
windowService
.
openWindow
(
paths
.
map
(
p
=>
typeof
p
===
'
string
'
?
URI
.
file
(
p
)
:
p
),
{
forceNewWindow
});
...
...
@@ -354,7 +354,6 @@ CommandsRegistry.registerCommand({
});
function
revealResourcesInOS
(
resources
:
URI
[],
windowsService
:
IWindowsService
,
notificationService
:
INotificationService
,
workspaceContextService
:
IWorkspaceContextService
):
void
{
// 54483: Check with @Isi
if
(
resources
.
length
)
{
sequence
(
resources
.
map
(
r
=>
()
=>
windowsService
.
showItemInFolder
(
paths
.
normalize
(
r
.
fsPath
,
true
))));
}
else
if
(
workspaceContextService
.
getWorkspace
().
folders
.
length
)
{
...
...
src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
浏览文件 @
850396fe
...
...
@@ -435,7 +435,6 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
// Update resource context based on focused element
this
.
disposables
.
push
(
this
.
explorerViewer
.
onDidChangeFocus
((
e
:
{
focus
:
ExplorerItem
})
=>
{
const
isSingleFolder
=
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
;
// 54483: Check with Isi
const
resource
=
e
.
focus
?
e
.
focus
.
resource
:
isSingleFolder
?
this
.
contextService
.
getWorkspace
().
folders
[
0
].
uri
:
undefined
;
this
.
resourceContext
.
set
(
resource
);
this
.
folderContext
.
set
((
isSingleFolder
&&
!
e
.
focus
)
||
e
.
focus
&&
e
.
focus
.
isDirectory
);
...
...
src/vs/workbench/parts/search/common/queryBuilder.ts
浏览文件 @
850396fe
...
...
@@ -270,7 +270,6 @@ export class QueryBuilder {
return
[
uri
.
file
(
paths
.
normalize
(
searchPath
))];
}
// 54483 Check with Rob
if
(
this
.
workspaceContextService
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
)
{
// TODO: @Sandy Try checking workspace folders length instead.
const
workspaceUri
=
this
.
workspaceContextService
.
getWorkspace
().
folders
[
0
].
uri
;
return
[
workspaceUri
.
with
({
path
:
paths
.
normalize
(
paths
.
join
(
workspaceUri
.
path
,
searchPath
))
})];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录