Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b0be0672
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,发现更多精彩内容 >>
提交
b0be0672
编写于
2月 25, 2020
作者:
J
Jackson Kearl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #91344.
上级
dbe62be3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
7 deletion
+13
-7
src/vs/workbench/contrib/searchEditor/browser/constants.ts
src/vs/workbench/contrib/searchEditor/browser/constants.ts
+1
-0
src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
...contrib/searchEditor/browser/searchEditor.contribution.ts
+10
-5
src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
...rkbench/contrib/searchEditor/browser/searchEditorInput.ts
+2
-2
未找到文件。
src/vs/workbench/contrib/searchEditor/browser/constants.ts
浏览文件 @
b0be0672
...
...
@@ -19,5 +19,6 @@ export const SelectAllSearchEditorMatchesCommandId = 'selectAllSearchEditorMatch
export
const
InSearchEditor
=
new
RawContextKey
<
boolean
>
(
'
inSearchEditor
'
,
false
);
export
const
SearchEditorScheme
=
'
search-editor
'
;
export
const
SearchEditorBodyScheme
=
'
search-editor-body
'
;
export
const
SearchEditorFindMatchClass
=
'
seaarchEditorFindMatch
'
;
src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts
浏览文件 @
b0be0672
...
...
@@ -21,7 +21,6 @@ import { EditorDescriptor, Extensions as EditorExtensions, IEditorRegistry } fro
import
{
Extensions
as
ActionExtensions
,
IWorkbenchActionRegistry
}
from
'
vs/workbench/common/actions
'
;
import
{
Extensions
as
WorkbenchExtensions
,
IWorkbenchContribution
,
IWorkbenchContributionsRegistry
}
from
'
vs/workbench/common/contributions
'
;
import
{
Extensions
as
EditorInputExtensions
,
IEditorInputFactory
,
IEditorInputFactoryRegistry
}
from
'
vs/workbench/common/editor
'
;
import
{
FileEditorInput
}
from
'
vs/workbench/contrib/files/common/editors/fileEditorInput
'
;
import
*
as
SearchConstants
from
'
vs/workbench/contrib/search/common/constants
'
;
import
*
as
SearchEditorConstants
from
'
vs/workbench/contrib/searchEditor/browser/constants
'
;
import
{
SearchEditor
}
from
'
vs/workbench/contrib/searchEditor/browser/searchEditor
'
;
...
...
@@ -30,6 +29,7 @@ import { getOrMakeSearchEditorInput, SearchEditorInput } from 'vs/workbench/cont
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
CommandsRegistry
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ServicesAccessor
}
from
'
vs/editor/browser/editorExtensions
'
;
import
{
FileEditorInput
}
from
'
vs/workbench/contrib/files/common/editors/fileEditorInput
'
;
//#region Editor Descriptior
Registry
.
as
<
IEditorRegistry
>
(
EditorExtensions
.
Editors
).
registerEditor
(
...
...
@@ -54,10 +54,15 @@ class SearchEditorContribution implements IWorkbenchContribution {
)
{
this
.
editorService
.
overrideOpenEditor
((
editor
,
options
,
group
)
=>
{
const
resource
=
editor
.
resource
;
if
(
!
resource
||
!
(
endsWith
(
resource
.
path
,
'
.code-search
'
)
||
resource
.
scheme
===
SearchEditorConstants
.
SearchEditorScheme
)
||
!
(
editor
instanceof
FileEditorInput
||
(
resource
.
scheme
===
SearchEditorConstants
.
SearchEditorScheme
)))
{
let
resource
=
editor
.
resource
;
if
(
!
resource
)
{
return
undefined
;
}
if
(
resource
.
scheme
===
SearchEditorConstants
.
SearchEditorBodyScheme
)
{
resource
=
resource
.
with
({
scheme
:
SearchEditorConstants
.
SearchEditorScheme
});
}
if
(
resource
.
scheme
!==
SearchEditorConstants
.
SearchEditorScheme
&&
!
(
endsWith
(
resource
.
path
,
'
.code-search
'
)
&&
editor
instanceof
FileEditorInput
))
{
return
undefined
;
}
...
...
src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.ts
浏览文件 @
b0be0672
...
...
@@ -18,7 +18,7 @@ import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
import
{
IInstantiationService
,
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
EditorInput
,
GroupIdentifier
,
IEditorInput
,
IRevertOptions
,
ISaveOptions
,
IMoveResult
}
from
'
vs/workbench/common/editor
'
;
import
{
SearchEditorFindMatchClass
,
SearchEditorScheme
}
from
'
vs/workbench/contrib/searchEditor/browser/constants
'
;
import
{
SearchEditorFindMatchClass
,
SearchEditorScheme
,
SearchEditorBodyScheme
}
from
'
vs/workbench/contrib/searchEditor/browser/constants
'
;
import
{
extractSearchQuery
,
serializeSearchConfiguration
}
from
'
vs/workbench/contrib/searchEditor/browser/searchEditorSerialization
'
;
import
{
IBackupFileService
}
from
'
vs/workbench/services/backup/common/backup
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
...
...
@@ -339,7 +339,7 @@ export const getOrMakeSearchEditorInput = (
}
}
const
contentsModelURI
=
uri
.
with
({
scheme
:
'
search-editor-body
'
});
const
contentsModelURI
=
uri
.
with
({
scheme
:
SearchEditorBodyScheme
});
const
headerModelURI
=
uri
.
with
({
scheme
:
'
search-editor-header
'
});
const
contentsModel
=
modelService
.
getModel
(
contentsModelURI
)
??
modelService
.
createModel
(
''
,
modeService
.
create
(
'
search-result
'
),
contentsModelURI
);
const
headerModel
=
modelService
.
getModel
(
headerModelURI
)
??
modelService
.
createModel
(
''
,
modeService
.
create
(
'
search-result
'
),
headerModelURI
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录