Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5ef859f6
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,发现更多精彩内容 >>
提交
5ef859f6
编写于
8月 27, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use `getOrCreateMode` and move api to proposed-stage first
上级
bd02bdbc
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
16 addition
and
20 deletion
+16
-20
src/vs/editor/common/services/languagesRegistry.ts
src/vs/editor/common/services/languagesRegistry.ts
+0
-4
src/vs/editor/common/services/modeService.ts
src/vs/editor/common/services/modeService.ts
+0
-1
src/vs/editor/common/services/modeServiceImpl.ts
src/vs/editor/common/services/modeServiceImpl.ts
+0
-9
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+0
-2
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+8
-1
src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
+7
-3
src/vs/workbench/api/node/extHost.api.impl.ts
src/vs/workbench/api/node/extHost.api.impl.ts
+1
-0
未找到文件。
src/vs/editor/common/services/languagesRegistry.ts
浏览文件 @
5ef859f6
...
...
@@ -211,10 +211,6 @@ export class LanguagesRegistry {
return
Object
.
keys
(
this
.
_nameMap
);
}
public
isRegisteredModeExact
(
modeId
:
string
):
boolean
{
return
hasOwnProperty
.
call
(
this
.
_languages
,
modeId
);
}
public
getLanguageName
(
modeId
:
string
):
string
{
if
(
!
hasOwnProperty
.
call
(
this
.
_languages
,
modeId
))
{
return
null
;
...
...
src/vs/editor/common/services/modeService.ts
浏览文件 @
5ef859f6
...
...
@@ -46,6 +46,5 @@ export interface IModeService {
getMode
(
commaSeparatedMimetypesOrCommaSeparatedIds
:
string
):
IMode
;
getOrCreateMode
(
commaSeparatedMimetypesOrCommaSeparatedIds
:
string
):
TPromise
<
IMode
>
;
getOrCreateModeByLanguageName
(
languageName
:
string
):
TPromise
<
IMode
>
;
getOrCreateModeByLanguageId
(
modeId
:
string
):
TPromise
<
IMode
>
;
getOrCreateModeByFilenameOrFirstLine
(
filename
:
string
,
firstLine
?:
string
):
TPromise
<
IMode
>
;
}
src/vs/editor/common/services/modeServiceImpl.ts
浏览文件 @
5ef859f6
...
...
@@ -132,15 +132,6 @@ export class ModeServiceImpl implements IModeService {
});
}
public
getOrCreateModeByLanguageId
(
modeId
:
string
):
TPromise
<
IMode
>
{
return
this
.
_onReady
().
then
(()
=>
{
if
(
!
this
.
_registry
.
isRegisteredModeExact
(
modeId
))
{
modeId
=
'
plaintext
'
;
}
return
this
.
_getOrCreateMode
(
modeId
);
});
}
private
_getModeIdByLanguageName
(
languageName
:
string
):
string
{
const
modeIds
=
this
.
_registry
.
getModeIdsFromLanguageName
(
languageName
);
...
...
src/vs/vscode.d.ts
浏览文件 @
5ef859f6
...
...
@@ -7375,8 +7375,6 @@ declare module 'vscode' {
*/
export
namespace
languages
{
export
function
changeLanguage
(
document
:
TextDocument
,
languageId
:
string
):
Thenable
<
void
>
;
/**
* Return the identifiers of all known languages.
* @return Promise resolving to an array of identifier strings.
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
5ef859f6
...
...
@@ -5,7 +5,6 @@
// This is the place for API experiments and proposal.
import
{
QuickPickItem
}
from
'
vscode
'
;
declare
module
'
vscode
'
{
...
...
@@ -13,6 +12,14 @@ declare module 'vscode' {
export
function
sampleFunction
():
Thenable
<
any
>
;
}
export
namespace
languages
{
/**
*
*/
export
function
changeLanguage
(
document
:
TextDocument
,
languageId
:
string
):
Thenable
<
void
>
;
}
//#region Rob: search provider
/**
...
...
src/vs/workbench/api/electron-browser/mainThreadLanguages.ts
浏览文件 @
5ef859f6
...
...
@@ -39,8 +39,12 @@ export class MainThreadLanguages implements MainThreadLanguagesShape {
if
(
!
model
)
{
return
TPromise
.
wrapError
(
new
Error
(
'
Invalid uri
'
));
}
let
mode
=
this
.
_modeService
.
getOrCreateModeByLanguageId
(
languageId
);
this
.
_modelService
.
setMode
(
model
,
mode
);
return
TPromise
.
as
(
null
);
return
this
.
_modeService
.
getOrCreateMode
(
languageId
).
then
(
mode
=>
{
if
(
mode
.
getId
()
!==
languageId
)
{
return
TPromise
.
wrapError
<
void
>
(
new
Error
(
`Unknown language id:
${
languageId
}
`
));
}
this
.
_modelService
.
setMode
(
model
,
mode
);
return
undefined
;
});
}
}
src/vs/workbench/api/node/extHost.api.impl.ts
浏览文件 @
5ef859f6
...
...
@@ -259,6 +259,7 @@ export function createApiFactory(
return
extHostLanguages
.
getLanguages
();
},
changeLanguage
(
document
:
vscode
.
TextDocument
,
languageId
:
string
):
TPromise
<
void
>
{
checkProposedApiEnabled
(
extension
);
return
extHostLanguages
.
changeLanguage
(
document
.
uri
,
languageId
);
},
match
(
selector
:
vscode
.
DocumentSelector
,
document
:
vscode
.
TextDocument
):
number
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录