Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
2bab0ad0
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,发现更多精彩内容 >>
未验证
提交
2bab0ad0
编写于
7月 22, 2021
作者:
T
Tyler Leonhardt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
exclude languages from language picker normal section if they are a detected language
上级
475eacd1
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
45 addition
and
40 deletion
+45
-40
src/vs/workbench/browser/parts/editor/editorStatus.ts
src/vs/workbench/browser/parts/editor/editorStatus.ts
+45
-40
未找到文件。
src/vs/workbench/browser/parts/editor/editorStatus.ts
浏览文件 @
2bab0ad0
...
@@ -1158,11 +1158,6 @@ export class ChangeModeAction extends Action {
...
@@ -1158,11 +1158,6 @@ export class ChangeModeAction extends Action {
const
textModel
=
activeTextEditorControl
.
getModel
();
const
textModel
=
activeTextEditorControl
.
getModel
();
const
resource
=
EditorResourceAccessor
.
getOriginalUri
(
this
.
editorService
.
activeEditor
,
{
supportSideBySide
:
SideBySideEditor
.
PRIMARY
});
const
resource
=
EditorResourceAccessor
.
getOriginalUri
(
this
.
editorService
.
activeEditor
,
{
supportSideBySide
:
SideBySideEditor
.
PRIMARY
});
let
hasLanguageSupport
=
!!
resource
;
if
(
resource
?.
scheme
===
Schemas
.
untitled
&&
!
this
.
textFileService
.
untitled
.
get
(
resource
)?.
hasAssociatedFilePath
)
{
hasLanguageSupport
=
false
;
// no configuration for untitled resources (e.g. "Untitled-1")
}
// Compute mode
// Compute mode
let
currentLanguageId
:
string
|
undefined
;
let
currentLanguageId
:
string
|
undefined
;
let
currentModeId
:
string
|
undefined
;
let
currentModeId
:
string
|
undefined
;
...
@@ -1171,9 +1166,22 @@ export class ChangeModeAction extends Action {
...
@@ -1171,9 +1166,22 @@ export class ChangeModeAction extends Action {
currentLanguageId
=
withNullAsUndefined
(
this
.
modeService
.
getLanguageName
(
currentModeId
));
currentLanguageId
=
withNullAsUndefined
(
this
.
modeService
.
getLanguageName
(
currentModeId
));
}
}
let
hasLanguageSupport
=
!!
resource
;
let
detectedLanguages
:
string
[]
=
[];
if
(
resource
?.
scheme
===
Schemas
.
untitled
&&
!
this
.
textFileService
.
untitled
.
get
(
resource
)?.
hasAssociatedFilePath
)
{
hasLanguageSupport
=
false
;
// no configuration for untitled resources (e.g. "Untitled-1")
// Detect languages since we are in an untitled file
detectedLanguages
=
await
this
.
languageDetectionService
.
detectLanguages
(
resource
);
}
// All languages are valid picks
// All languages are valid picks
const
languages
=
this
.
modeService
.
getRegisteredLanguageNames
();
const
languages
=
this
.
modeService
.
getRegisteredLanguageNames
();
const
picks
:
QuickPickInput
[]
=
languages
.
sort
().
map
(
lang
=>
{
const
picks
:
QuickPickInput
[]
=
languages
.
sort
()
.
filter
(
lang
=>
{
const
modeId
=
this
.
modeService
.
getModeIdForLanguageName
(
lang
.
toLowerCase
())
||
'
unknown
'
;
return
(
detectedLanguages
.
indexOf
(
modeId
)
===
-
1
);
}).
map
(
lang
=>
{
const
modeId
=
this
.
modeService
.
getModeIdForLanguageName
(
lang
.
toLowerCase
())
||
'
unknown
'
;
const
modeId
=
this
.
modeService
.
getModeIdForLanguageName
(
lang
.
toLowerCase
())
||
'
unknown
'
;
const
extensions
=
this
.
modeService
.
getExtensions
(
lang
).
join
(
'
'
);
const
extensions
=
this
.
modeService
.
getExtensions
(
lang
).
join
(
'
'
);
let
description
:
string
;
let
description
:
string
;
...
@@ -1218,10 +1226,8 @@ export class ChangeModeAction extends Action {
...
@@ -1218,10 +1226,8 @@ export class ChangeModeAction extends Action {
if
(
hasLanguageSupport
)
{
if
(
hasLanguageSupport
)
{
picks
.
unshift
(
autoDetectMode
);
picks
.
unshift
(
autoDetectMode
);
}
else
if
(
resource
)
{
}
else
if
(
detectedLanguages
)
{
// Handle language detection
// Add untitled detected languages
const
detectedLanguages
=
await
this
.
languageDetectionService
.
detectLanguages
(
resource
);
if
(
detectedLanguages
)
{
for
(
const
modeId
of
detectedLanguages
.
reverse
())
{
for
(
const
modeId
of
detectedLanguages
.
reverse
())
{
const
lang
=
this
.
modeService
.
getLanguageName
(
modeId
)
||
'
unknown
'
;
const
lang
=
this
.
modeService
.
getLanguageName
(
modeId
)
||
'
unknown
'
;
let
description
:
string
;
let
description
:
string
;
...
@@ -1240,7 +1246,6 @@ export class ChangeModeAction extends Action {
...
@@ -1240,7 +1246,6 @@ export class ChangeModeAction extends Action {
picks
.
unshift
({
type
:
'
separator
'
,
label
:
localize
(
'
detectedLanguagesPicks
'
,
"
detected languages (identifier)
"
)
});
picks
.
unshift
({
type
:
'
separator
'
,
label
:
localize
(
'
detectedLanguagesPicks
'
,
"
detected languages (identifier)
"
)
});
}
}
}
const
pick
=
await
this
.
quickInputService
.
pick
(
picks
,
{
placeHolder
:
localize
(
'
pickLanguage
'
,
"
Select Language Mode
"
),
matchOnDescription
:
true
});
const
pick
=
await
this
.
quickInputService
.
pick
(
picks
,
{
placeHolder
:
localize
(
'
pickLanguage
'
,
"
Select Language Mode
"
),
matchOnDescription
:
true
});
if
(
!
pick
)
{
if
(
!
pick
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录