Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1f21bcd6
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,发现更多精彩内容 >>
提交
1f21bcd6
编写于
6月 09, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
diff editor - persist viewstate as well
上级
0f1540e7
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
12 addition
and
9 deletion
+12
-9
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
+12
-9
未找到文件。
src/vs/workbench/browser/parts/editor/textDiffEditor.ts
浏览文件 @
1f21bcd6
...
@@ -9,7 +9,7 @@ import { isFunction, isObject, isArray, assertIsDefined } from 'vs/base/common/t
...
@@ -9,7 +9,7 @@ import { isFunction, isObject, isArray, assertIsDefined } from 'vs/base/common/t
import
{
IDiffEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IDiffEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IDiffEditorOptions
,
IEditorOptions
as
ICodeEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
IDiffEditorOptions
,
IEditorOptions
as
ICodeEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
BaseTextEditor
,
IEditorConfiguration
}
from
'
vs/workbench/browser/parts/editor/textEditor
'
;
import
{
BaseTextEditor
,
IEditorConfiguration
}
from
'
vs/workbench/browser/parts/editor/textEditor
'
;
import
{
TextEditorOptions
,
EditorInput
,
EditorOptions
,
TEXT_DIFF_EDITOR_ID
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorInputExtensions
,
ITextDiffEditorPane
,
IEditorMemento
}
from
'
vs/workbench/common/editor
'
;
import
{
TextEditorOptions
,
EditorInput
,
EditorOptions
,
TEXT_DIFF_EDITOR_ID
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorInputExtensions
,
ITextDiffEditorPane
}
from
'
vs/workbench/common/editor
'
;
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
DiffNavigator
}
from
'
vs/editor/browser/widget/diffNavigator
'
;
import
{
DiffNavigator
}
from
'
vs/editor/browser/widget/diffNavigator
'
;
import
{
DiffEditorWidget
}
from
'
vs/editor/browser/widget/diffEditorWidget
'
;
import
{
DiffEditorWidget
}
from
'
vs/editor/browser/widget/diffEditorWidget
'
;
...
@@ -28,7 +28,6 @@ import { Event } from 'vs/base/common/event';
...
@@ -28,7 +28,6 @@ import { Event } from 'vs/base/common/event';
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
IEditorService
,
ACTIVE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorService
,
ACTIVE_GROUP
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
EditorMemento
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
EditorActivation
,
IEditorOptions
}
from
'
vs/platform/editor/common/editor
'
;
import
{
EditorActivation
,
IEditorOptions
}
from
'
vs/platform/editor/common/editor
'
;
/**
/**
...
@@ -53,10 +52,6 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
...
@@ -53,10 +52,6 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
super
(
TextDiffEditor
.
ID
,
telemetryService
,
instantiationService
,
storageService
,
configurationService
,
themeService
,
editorService
,
editorGroupService
);
super
(
TextDiffEditor
.
ID
,
telemetryService
,
instantiationService
,
storageService
,
configurationService
,
themeService
,
editorService
,
editorGroupService
);
}
}
protected
getEditorMemento
<
T
>
(
editorGroupService
:
IEditorGroupsService
,
key
:
string
,
limit
:
number
=
10
):
IEditorMemento
<
T
>
{
return
new
EditorMemento
(
this
.
getId
(),
key
,
Object
.
create
(
null
),
limit
,
editorGroupService
);
// do not persist in storage as diff editors are never persisted
}
getTitle
():
string
{
getTitle
():
string
{
if
(
this
.
input
)
{
if
(
this
.
input
)
{
return
this
.
input
.
getName
();
return
this
.
input
.
getName
();
...
@@ -75,7 +70,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
...
@@ -75,7 +70,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
this
.
diffNavigatorDisposables
.
clear
();
this
.
diffNavigatorDisposables
.
clear
();
// Remember view settings if input changes
// Remember view settings if input changes
this
.
save
TextDiffEditorViewState
(
this
.
input
);
this
.
doSaveOrClear
TextDiffEditorViewState
(
this
.
input
);
// Set input and resolve
// Set input and resolve
await
super
.
setInput
(
input
,
options
,
token
);
await
super
.
setInput
(
input
,
options
,
token
);
...
@@ -233,7 +228,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
...
@@ -233,7 +228,7 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
this
.
diffNavigatorDisposables
.
clear
();
this
.
diffNavigatorDisposables
.
clear
();
// Keep editor view state in settings to restore when coming back
// Keep editor view state in settings to restore when coming back
this
.
save
TextDiffEditorViewState
(
this
.
input
);
this
.
doSaveOrClear
TextDiffEditorViewState
(
this
.
input
);
// Clear Model
// Clear Model
const
diffEditor
=
this
.
getControl
();
const
diffEditor
=
this
.
getControl
();
...
@@ -257,7 +252,15 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
...
@@ -257,7 +252,15 @@ export class TextDiffEditor extends BaseTextEditor implements ITextDiffEditorPan
return
super
.
loadTextEditorViewState
(
resource
)
as
IDiffEditorViewState
;
// overridden for text diff editor support
return
super
.
loadTextEditorViewState
(
resource
)
as
IDiffEditorViewState
;
// overridden for text diff editor support
}
}
private
saveTextDiffEditorViewState
(
input
:
EditorInput
|
undefined
):
void
{
protected
saveState
():
void
{
// Update/clear editor view State
this
.
doSaveOrClearTextDiffEditorViewState
(
this
.
input
);
super
.
saveState
();
}
private
doSaveOrClearTextDiffEditorViewState
(
input
:
EditorInput
|
undefined
):
void
{
if
(
!
(
input
instanceof
DiffEditorInput
))
{
if
(
!
(
input
instanceof
DiffEditorInput
))
{
return
;
// only supported for diff editor inputs
return
;
// only supported for diff editor inputs
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录