Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
981cd09c
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
981cd09c
编写于
6月 21, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
add folder
上级
58b081de
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
15 addition
and
13 deletion
+15
-13
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+5
-3
src/vs/platform/windows/common/windows.ts
src/vs/platform/windows/common/windows.ts
+2
-2
src/vs/platform/windows/common/windowsIpc.ts
src/vs/platform/windows/common/windowsIpc.ts
+2
-2
src/vs/platform/windows/electron-browser/windowService.ts
src/vs/platform/windows/electron-browser/windowService.ts
+1
-1
src/vs/platform/windows/electron-main/windows.ts
src/vs/platform/windows/electron-main/windows.ts
+1
-1
src/vs/platform/windows/electron-main/windowsService.ts
src/vs/platform/windows/electron-main/windowsService.ts
+1
-1
src/vs/workbench/browser/actions/fileActions.ts
src/vs/workbench/browser/actions/fileActions.ts
+1
-1
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+2
-2
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
981cd09c
...
...
@@ -1135,14 +1135,14 @@ export class WindowsManager implements IWindowsMainService {
}
public
pickFileAndOpen
(
forceNewWindow
?:
boolean
,
path
?:
string
,
window
?:
CodeWindow
,
data
?:
ITelemetryData
):
void
{
this
.
fileDialog
.
pickAndOpen
({
pickFiles
:
true
,
forceNewWindow
,
path
,
window
},
'
openFile
'
,
data
);
this
.
fileDialog
.
pickAndOpen
({
pickFiles
:
true
,
forceNewWindow
,
path
,
window
,
title
:
nls
.
localize
(
'
openFile
'
,
"
Open File
"
)
},
'
openFile
'
,
data
);
}
public
pickFolderAndOpen
(
forceNewWindow
?:
boolean
,
window
?:
CodeWindow
,
data
?:
ITelemetryData
):
void
{
this
.
fileDialog
.
pickAndOpen
({
pickFolders
:
true
,
forceNewWindow
,
window
},
'
openFolder
'
,
data
);
this
.
fileDialog
.
pickAndOpen
({
pickFolders
:
true
,
forceNewWindow
,
window
,
title
:
nls
.
localize
(
'
openFolder
'
,
"
Open Folder
"
)
},
'
openFolder
'
,
data
);
}
public
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
{
public
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
{
return
new
TPromise
((
c
,
e
)
=>
{
this
.
fileDialog
.
getFileOrFolderPaths
({
pickFolders
:
true
,
buttonLabel
:
options
&&
options
.
buttonLabel
},
folders
=>
{
c
(
folders
||
[]);
...
...
@@ -1169,6 +1169,7 @@ export class WindowsManager implements IWindowsMainService {
}
interface
INativeOpenDialogOptions
{
title
?:
string
;
pickFolders
?:
boolean
;
pickFiles
?:
boolean
;
path
?:
string
;
...
...
@@ -1215,6 +1216,7 @@ class FileDialog {
}
dialog
.
showOpenDialog
(
focussedWindow
&&
focussedWindow
.
win
,
{
title
:
options
&&
options
.
title
?
options
.
title
:
void
0
,
defaultPath
:
workingDir
,
properties
:
pickerProperties
,
buttonLabel
:
options
&&
options
.
buttonLabel
?
options
.
buttonLabel
:
void
0
...
...
src/vs/platform/windows/common/windows.ts
浏览文件 @
981cd09c
...
...
@@ -24,7 +24,7 @@ export interface IWindowsService {
pickFileFolderAndOpen
(
windowId
:
number
,
forceNewWindow
?:
boolean
,
data
?:
ITelemetryData
):
TPromise
<
void
>
;
pickFileAndOpen
(
windowId
:
number
,
forceNewWindow
?:
boolean
,
path
?:
string
,
data
?:
ITelemetryData
):
TPromise
<
void
>
;
pickFolderAndOpen
(
windowId
:
number
,
forceNewWindow
?:
boolean
,
data
?:
ITelemetryData
):
TPromise
<
void
>
;
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
;
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
;
reloadWindow
(
windowId
:
number
):
TPromise
<
void
>
;
openDevTools
(
windowId
:
number
):
TPromise
<
void
>
;
toggleDevTools
(
windowId
:
number
):
TPromise
<
void
>
;
...
...
@@ -78,7 +78,7 @@ export interface IWindowService {
pickFileFolderAndOpen
(
forceNewWindow
?:
boolean
,
data
?:
ITelemetryData
):
TPromise
<
void
>
;
pickFileAndOpen
(
forceNewWindow
?:
boolean
,
path
?:
string
,
data
?:
ITelemetryData
):
TPromise
<
void
>
;
pickFolderAndOpen
(
forceNewWindow
?:
boolean
,
data
?:
ITelemetryData
):
TPromise
<
void
>
;
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
;
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
;
reloadWindow
():
TPromise
<
void
>
;
openDevTools
():
TPromise
<
void
>
;
toggleDevTools
():
TPromise
<
void
>
;
...
...
src/vs/platform/windows/common/windowsIpc.ts
浏览文件 @
981cd09c
...
...
@@ -17,7 +17,7 @@ export interface IWindowsChannel extends IChannel {
call
(
command
:
'
pickFileFolderAndOpen
'
,
arg
:
[
number
,
boolean
,
ITelemetryData
]):
TPromise
<
void
>
;
call
(
command
:
'
pickFileAndOpen
'
,
arg
:
[
number
,
boolean
,
string
,
ITelemetryData
]):
TPromise
<
void
>
;
call
(
command
:
'
pickFolderAndOpen
'
,
arg
:
[
number
,
boolean
,
ITelemetryData
]):
TPromise
<
void
>
;
call
(
command
:
'
pickFolder
'
,
arg
:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
;
call
(
command
:
'
pickFolder
'
,
arg
:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
;
call
(
command
:
'
reloadWindow
'
,
arg
:
number
):
TPromise
<
void
>
;
call
(
command
:
'
toggleDevTools
'
,
arg
:
number
):
TPromise
<
void
>
;
call
(
command
:
'
closeFolder
'
,
arg
:
number
):
TPromise
<
void
>
;
...
...
@@ -129,7 +129,7 @@ export class WindowsChannelClient implements IWindowsService {
return
this
.
channel
.
call
(
'
pickFolderAndOpen
'
,
[
windowId
,
forceNewWindow
,
data
]);
}
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
{
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
{
return
this
.
channel
.
call
(
'
pickFolder
'
,
options
);
}
...
...
src/vs/platform/windows/electron-browser/windowService.ts
浏览文件 @
981cd09c
...
...
@@ -34,7 +34,7 @@ export class WindowService implements IWindowService {
return
this
.
windowsService
.
pickFolderAndOpen
(
this
.
windowId
,
forceNewWindow
,
data
);
}
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
{
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
{
return
this
.
windowsService
.
pickFolder
(
options
);
}
...
...
src/vs/platform/windows/electron-main/windows.ts
浏览文件 @
981cd09c
...
...
@@ -52,7 +52,7 @@ export interface IWindowsMainService {
pickFileFolderAndOpen
(
forceNewWindow
?:
boolean
,
data
?:
ITelemetryData
):
void
;
pickFileAndOpen
(
forceNewWindow
?:
boolean
,
path
?:
string
,
window
?:
ICodeWindow
,
data
?:
ITelemetryData
):
void
;
pickFolderAndOpen
(
forceNewWindow
?:
boolean
,
window
?:
ICodeWindow
,
data
?:
ITelemetryData
):
void
;
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
;
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
;
focusLastActive
(
cli
:
ParsedArgs
,
context
:
OpenContext
):
ICodeWindow
;
getLastActiveWindow
():
ICodeWindow
;
findWindow
(
workspacePath
:
string
,
filePath
?:
string
,
extensionDevelopmentPath
?:
string
):
ICodeWindow
;
...
...
src/vs/platform/windows/electron-main/windowsService.ts
浏览文件 @
981cd09c
...
...
@@ -67,7 +67,7 @@ export class WindowsService implements IWindowsService, IDisposable {
return
TPromise
.
as
(
null
);
}
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
{
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
{
return
this
.
windowsMainService
.
pickFolder
(
options
);
}
...
...
src/vs/workbench/browser/actions/fileActions.ts
浏览文件 @
981cd09c
...
...
@@ -72,7 +72,7 @@ export class AddRootFolderAction extends Action {
return
this
.
windowService
.
pickFolderAndOpen
(
false
/* prefer same window */
);
}
return
this
.
windowService
.
pickFolder
({
buttonLabel
:
nls
.
localize
(
'
add
'
,
"
Add
"
)
}).
then
(
folders
=>
{
return
this
.
windowService
.
pickFolder
({
buttonLabel
:
nls
.
localize
(
'
add
'
,
"
Add
"
)
,
title
:
nls
.
localize
(
'
addRootFolder
'
,
"
Add Root Folder
"
)
}).
then
(
folders
=>
{
return
this
.
workspaceEditingService
.
addRoots
(
folders
.
map
(
folder
=>
URI
.
file
(
folder
))).
then
(()
=>
{
return
this
.
viewletService
.
openViewlet
(
this
.
viewletService
.
getDefaultViewletId
(),
true
);
});
...
...
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
981cd09c
...
...
@@ -858,7 +858,7 @@ export class TestWindowService implements IWindowService {
return
TPromise
.
as
(
void
0
);
}
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
{
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
{
return
TPromise
.
as
([]);
}
...
...
@@ -981,7 +981,7 @@ export class TestWindowsService implements IWindowsService {
return
TPromise
.
as
(
void
0
);
}
pickFolder
(
options
?:
{
buttonLabel
:
string
}):
TPromise
<
string
[]
>
{
pickFolder
(
options
?:
{
buttonLabel
:
string
;
title
:
string
;
}):
TPromise
<
string
[]
>
{
return
TPromise
.
as
([]);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录