Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6e91d01e
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,发现更多精彩内容 >>
提交
6e91d01e
编写于
3月 11, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Git merge / commit -a / focus back the integrated terminal
上级
1c91b6ba
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
5 deletion
+19
-5
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+6
-5
src/vs/platform/windows/common/windows.ts
src/vs/platform/windows/common/windows.ts
+1
-0
src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
...orkbench/parts/terminal/electron-browser/terminalPanel.ts
+12
-0
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
6e91d01e
...
...
@@ -536,7 +536,7 @@ export class WindowsManager implements IWindowsMainService {
else
{
// Do open files
usedWindows
.
push
(
this
.
doOpenFilesInExistingWindow
(
bestWindowOrFolder
,
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
));
usedWindows
.
push
(
this
.
doOpenFilesInExistingWindow
(
openConfig
,
bestWindowOrFolder
,
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
));
// Reset these because we handled them
filesToOpen
=
[];
...
...
@@ -582,7 +582,7 @@ export class WindowsManager implements IWindowsMainService {
const
windowOnWorkspace
=
windowsOnWorkspace
[
0
];
// Do open files
usedWindows
.
push
(
this
.
doOpenFilesInExistingWindow
(
windowOnWorkspace
,
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
));
usedWindows
.
push
(
this
.
doOpenFilesInExistingWindow
(
openConfig
,
windowOnWorkspace
,
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
));
// Reset these because we handled them
filesToOpen
=
[];
...
...
@@ -622,7 +622,7 @@ export class WindowsManager implements IWindowsMainService {
const
windowOnFolderPath
=
windowsOnFolderPath
[
0
];
// Do open files
usedWindows
.
push
(
this
.
doOpenFilesInExistingWindow
(
windowOnFolderPath
,
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
));
usedWindows
.
push
(
this
.
doOpenFilesInExistingWindow
(
openConfig
,
windowOnFolderPath
,
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
));
// Reset these because we handled them
filesToOpen
=
[];
...
...
@@ -694,11 +694,12 @@ export class WindowsManager implements IWindowsMainService {
return
arrays
.
distinct
(
usedWindows
);
}
private
doOpenFilesInExistingWindow
(
window
:
ICodeWindow
,
filesToOpen
:
IPath
[],
filesToCreate
:
IPath
[],
filesToDiff
:
IPath
[],
filesToWait
:
IPathsToWaitFor
):
ICodeWindow
{
private
doOpenFilesInExistingWindow
(
configuration
:
IOpenConfiguration
,
window
:
ICodeWindow
,
filesToOpen
:
IPath
[],
filesToCreate
:
IPath
[],
filesToDiff
:
IPath
[],
filesToWait
:
IPathsToWaitFor
):
ICodeWindow
{
window
.
focus
();
// make sure window has focus
window
.
ready
().
then
(
readyWindow
=>
{
readyWindow
.
send
(
'
vscode:openFiles
'
,
{
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
});
const
termProgram
=
configuration
.
userEnv
?
configuration
.
userEnv
[
'
TERM_PROGRAM
'
]
:
void
0
;
readyWindow
.
send
(
'
vscode:openFiles
'
,
{
filesToOpen
,
filesToCreate
,
filesToDiff
,
filesToWait
,
termProgram
});
});
return
window
;
...
...
src/vs/platform/windows/common/windows.ts
浏览文件 @
6e91d01e
...
...
@@ -292,6 +292,7 @@ export interface IOpenFileRequest {
filesToCreate
?:
IPath
[];
filesToDiff
?:
IPath
[];
filesToWait
?:
IPathsToWaitFor
;
termProgram
?:
string
;
}
export
interface
IAddFoldersRequest
{
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
浏览文件 @
6e91d01e
...
...
@@ -28,6 +28,9 @@ import { PANEL_BACKGROUND, PANEL_BORDER } from 'vs/workbench/common/theme';
import
{
TERMINAL_BACKGROUND_COLOR
,
TERMINAL_BORDER_COLOR
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalColorRegistry
'
;
import
{
DataTransfers
}
from
'
vs/base/browser/dnd
'
;
import
{
ILifecycleService
,
LifecyclePhase
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
ipcRenderer
as
ipc
}
from
'
electron
'
;
import
{
IOpenFileRequest
}
from
'
vs/platform/windows/common/windows
'
;
import
{
whenDeleted
}
from
'
vs/base/node/pfs
'
;
export
class
TerminalPanel
extends
Panel
{
...
...
@@ -83,6 +86,15 @@ export class TerminalPanel extends Panel {
this
.
_updateFont
();
this
.
_updateTheme
();
ipc
.
on
(
'
vscode:openFiles
'
,
(
_event
:
any
,
request
:
IOpenFileRequest
)
=>
{
// if the request to open files is coming in from the integrated terminal (identified though
// the termProgram variable) and we are instructed to wait for editors close, wait for the
// marker file to get deleted and then focus back to the integrated terminal.
if
(
request
.
termProgram
===
'
vscode
'
&&
request
.
filesToWait
)
{
whenDeleted
(
request
.
filesToWait
.
waitMarkerFilePath
).
then
(()
=>
this
.
focus
());
}
});
// Force another layout (first is setContainers) since config has changed
this
.
layout
(
new
Dimension
(
this
.
_terminalContainer
.
offsetWidth
,
this
.
_terminalContainer
.
offsetHeight
));
return
TPromise
.
as
(
void
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录