Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8e77e9f5
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,发现更多精彩内容 >>
提交
8e77e9f5
编写于
1月 27, 2020
作者:
J
Jackson Kearl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restore search editor names on reload
上级
0e19922e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
5 deletion
+9
-5
src/vs/workbench/contrib/search/browser/searchEditorInput.ts
src/vs/workbench/contrib/search/browser/searchEditorInput.ts
+9
-5
未找到文件。
src/vs/workbench/contrib/search/browser/searchEditorInput.ts
浏览文件 @
8e77e9f5
...
@@ -54,6 +54,7 @@ export class SearchEditorInput extends EditorInput {
...
@@ -54,6 +54,7 @@ export class SearchEditorInput extends EditorInput {
private
readonly
model
:
Promise
<
ITextModel
>
;
private
readonly
model
:
Promise
<
ITextModel
>
;
private
resolvedModel
?:
{
model
:
ITextModel
,
query
:
SearchConfiguration
};
private
resolvedModel
?:
{
model
:
ITextModel
,
query
:
SearchConfiguration
};
viewState
:
SearchEditorViewState
=
{
focused
:
'
input
'
};
viewState
:
SearchEditorViewState
=
{
focused
:
'
input
'
};
_restoredName
:
string
|
undefined
;
constructor
(
constructor
(
public
readonly
resource
:
URI
,
public
readonly
resource
:
URI
,
...
@@ -122,9 +123,10 @@ export class SearchEditorInput extends EditorInput {
...
@@ -122,9 +123,10 @@ export class SearchEditorInput extends EditorInput {
getName
():
string
{
getName
():
string
{
if
(
this
.
isUntitled
())
{
if
(
this
.
isUntitled
())
{
return
this
.
resolvedModel
?.
query
.
query
return
this
.
_restoredName
??
?
localize
(
'
searchTitle.withQuery
'
,
"
Search: {0}
"
,
this
.
resolvedModel
?.
query
.
query
)
(
this
.
resolvedModel
?.
query
.
query
:
localize
(
'
searchTitle
'
,
"
Search
"
);
?
localize
(
'
searchTitle.withQuery
'
,
"
Search: {0}
"
,
this
.
resolvedModel
?.
query
.
query
)
:
localize
(
'
searchTitle
'
,
"
Search
"
));
}
}
return
localize
(
'
searchTitle.withQuery
'
,
"
Search: {0}
"
,
basename
(
this
.
resource
.
path
,
'
.code-search
'
));
return
localize
(
'
searchTitle.withQuery
'
,
"
Search: {0}
"
,
basename
(
this
.
resource
.
path
,
'
.code-search
'
));
...
@@ -134,6 +136,7 @@ export class SearchEditorInput extends EditorInput {
...
@@ -134,6 +136,7 @@ export class SearchEditorInput extends EditorInput {
const
model
=
await
this
.
model
;
const
model
=
await
this
.
model
;
const
query
=
extractSearchQuery
(
model
);
const
query
=
extractSearchQuery
(
model
);
this
.
resolvedModel
=
{
model
,
query
};
this
.
resolvedModel
=
{
model
,
query
};
this
.
_restoredName
=
undefined
;
// not needed after the model has been resolved
this
.
_onDidChangeLabel
.
fire
();
this
.
_onDidChangeLabel
.
fire
();
return
{
model
,
query
};
return
{
model
,
query
};
}
}
...
@@ -274,14 +277,15 @@ export class SearchEditorInputFactory implements IEditorInputFactory {
...
@@ -274,14 +277,15 @@ export class SearchEditorInputFactory implements IEditorInputFactory {
const
config
=
input
.
getConfigSync
();
const
config
=
input
.
getConfigSync
();
return
JSON
.
stringify
({
resource
,
dirty
:
input
.
isDirty
(),
config
,
viewState
:
input
.
viewState
});
return
JSON
.
stringify
({
resource
,
dirty
:
input
.
isDirty
(),
config
,
viewState
:
input
.
viewState
,
name
:
input
.
getName
()
});
}
}
deserialize
(
instantiationService
:
IInstantiationService
,
serializedEditorInput
:
string
):
SearchEditorInput
|
undefined
{
deserialize
(
instantiationService
:
IInstantiationService
,
serializedEditorInput
:
string
):
SearchEditorInput
|
undefined
{
const
{
resource
,
dirty
,
config
,
viewState
}
=
JSON
.
parse
(
serializedEditorInput
);
const
{
resource
,
dirty
,
config
,
viewState
,
name
}
=
JSON
.
parse
(
serializedEditorInput
);
if
(
config
&&
(
config
.
query
!==
undefined
))
{
if
(
config
&&
(
config
.
query
!==
undefined
))
{
const
input
=
instantiationService
.
invokeFunction
(
getOrMakeSearchEditorInput
,
{
text
:
serializeSearchConfiguration
(
config
),
uri
:
URI
.
parse
(
resource
)
});
const
input
=
instantiationService
.
invokeFunction
(
getOrMakeSearchEditorInput
,
{
text
:
serializeSearchConfiguration
(
config
),
uri
:
URI
.
parse
(
resource
)
});
input
.
viewState
=
viewState
;
input
.
viewState
=
viewState
;
input
.
_restoredName
=
name
;
input
.
setDirty
(
dirty
);
input
.
setDirty
(
dirty
);
return
input
;
return
input
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录