Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
83f6203e
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,发现更多精彩内容 >>
提交
83f6203e
编写于
1月 22, 2018
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/Microsoft/vscode
上级
48a6f717
ad3f4f27
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
2 deletion
+12
-2
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+11
-1
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+1
-1
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
83f6203e
...
@@ -1326,7 +1326,17 @@ export class WindowsManager implements IWindowsMainService {
...
@@ -1326,7 +1326,17 @@ export class WindowsManager implements IWindowsMainService {
}
}
// Handle untitled workspaces with prompt as needed
// Handle untitled workspaces with prompt as needed
e
.
veto
(
this
.
workspacesManager
.
promptToSaveUntitledWorkspace
(
this
.
getWindowById
(
e
.
window
.
id
),
workspace
));
e
.
veto
(
this
.
workspacesManager
.
promptToSaveUntitledWorkspace
(
this
.
getWindowById
(
e
.
window
.
id
),
workspace
).
then
(
veto
=>
{
if
(
veto
)
{
return
veto
;
}
// Bug in electron: somehow we need this timeout so that the window closes properly. That
// might be related to the fact that the untitled workspace prompt shows up async and this
// code can execute before the dialog is fully closed which then blocks the window from closing.
// Issue: https://github.com/Microsoft/vscode/issues/41989
return
TPromise
.
timeout
(
0
).
then
(()
=>
veto
);
}));
}
}
public
focusLastActive
(
cli
:
ParsedArgs
,
context
:
OpenContext
):
CodeWindow
{
public
focusLastActive
(
cli
:
ParsedArgs
,
context
:
OpenContext
):
CodeWindow
{
...
...
src/vs/editor/common/model/textModel.ts
浏览文件 @
83f6203e
...
@@ -38,7 +38,7 @@ import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeText
...
@@ -38,7 +38,7 @@ import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeText
import
{
ChunksTextBufferBuilder
}
from
'
vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder
'
;
import
{
ChunksTextBufferBuilder
}
from
'
vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder
'
;
// Here is the master switch for the text buffer implementation:
// Here is the master switch for the text buffer implementation:
const
USE_PIECE_TREE_IMPLEMENTATION
=
fals
e
;
const
USE_PIECE_TREE_IMPLEMENTATION
=
tru
e
;
const
USE_CHUNKS_TEXT_BUFFER
=
false
;
const
USE_CHUNKS_TEXT_BUFFER
=
false
;
function
createTextBufferBuilder
()
{
function
createTextBufferBuilder
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录