Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1744078c
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,发现更多精彩内容 >>
提交
1744078c
编写于
4月 05, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Some cleanup in LanguagesRegistry
上级
e57e0669
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
64 addition
and
73 deletion
+64
-73
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+12
-3
src/vs/editor/common/services/languagesRegistry.ts
src/vs/editor/common/services/languagesRegistry.ts
+47
-59
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
+5
-10
未找到文件。
src/vs/editor/common/modes.ts
浏览文件 @
1744078c
...
...
@@ -30,12 +30,21 @@ export const enum LanguageId {
* @internal
*/
export
class
LanguageIdentifier
{
/**
* A string identifier. Unique across languages. e.g. 'javascript'.
*/
public
readonly
language
:
string
;
/**
* A numeric identifier. Unique across languages. e.g. 5
* Will vary at runtime based on registration order, etc.
*/
public
readonly
id
:
LanguageId
;
constructor
(
sid
:
string
,
i
id
:
LanguageId
)
{
this
.
language
=
sid
;
this
.
id
=
i
i
d
;
constructor
(
language
:
string
,
id
:
LanguageId
)
{
this
.
language
=
language
;
this
.
id
=
id
;
}
}
...
...
src/vs/editor/common/services/languagesRegistry.ts
浏览文件 @
1744078c
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
*
as
mime
from
'
vs/base/common/mime
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
Registry
}
from
'
vs/platform/platform
'
;
...
...
@@ -18,7 +17,7 @@ import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/co
var
hasOwnProperty
=
Object
.
prototype
.
hasOwnProperty
;
export
interface
IResolvedLanguage
{
id
:
LanguageId
;
id
entifier
:
LanguageIdentifier
;
name
:
string
;
mimetypes
:
string
[];
aliases
:
string
[];
...
...
@@ -31,22 +30,19 @@ export class LanguagesRegistry {
private
_nextLanguageId
:
number
;
private
_languages
:
{
[
id
:
string
]:
IResolvedLanguage
;
};
private
_languageIds
:
string
[];
private
mime2LanguageId
:
{
[
mimeType
:
string
]:
string
;
};
private
name2LanguageId
:
{
[
name
:
string
]:
string
;
};
private
lowerName2Id
:
{
[
name
:
string
]:
string
;
};
private
languageIds
:
string
[];
private
_onDidAddModes
:
Emitter
<
string
[]
>
=
new
Emitter
<
string
[]
>
();
public
onDidAddModes
:
Event
<
string
[]
>
=
this
.
_onDidAddModes
.
event
;
private
_mimeTypesMap
:
{
[
mimeType
:
string
]:
LanguageIdentifier
;
};
private
_nameMap
:
{
[
name
:
string
]:
LanguageIdentifier
;
};
private
_lowercaseNameMap
:
{
[
name
:
string
]:
LanguageIdentifier
;
};
constructor
(
useModesRegistry
=
true
)
{
this
.
_nextLanguageId
=
1
;
this
.
_languages
=
{};
this
.
mime2LanguageId
=
{};
this
.
name2LanguageId
=
{};
this
.
lowerName2Id
=
{};
this
.
languageIds
=
[];
this
.
_mimeTypesMap
=
{};
this
.
_nameMap
=
{};
this
.
_lowercaseNameMap
=
{};
this
.
_
languageIds
=
[];
if
(
useModesRegistry
)
{
this
.
_registerLanguages
(
ModesRegistry
.
getLanguages
());
...
...
@@ -59,31 +55,28 @@ export class LanguagesRegistry {
return
;
}
let
addedModes
:
string
[]
=
[];
for
(
let
i
=
0
;
i
<
desc
.
length
;
i
++
)
{
this
.
_registerLanguage
(
desc
[
i
]);
addedModes
.
push
(
desc
[
i
].
id
);
}
// Rebuild fast path maps
this
.
mime2LanguageId
=
{};
this
.
name2LanguageId
=
{};
this
.
lowerName2Id
=
{};
this
.
_mimeTypesMap
=
{};
this
.
_nameMap
=
{};
this
.
_lowercaseNameMap
=
{};
Object
.
keys
(
this
.
_languages
).
forEach
((
langId
)
=>
{
let
language
=
this
.
_languages
[
langId
];
if
(
language
.
name
)
{
this
.
name2LanguageId
[
language
.
name
]
=
langId
;
this
.
_nameMap
[
language
.
name
]
=
language
.
identifier
;
}
language
.
aliases
.
forEach
((
alias
)
=>
{
this
.
lowerName2Id
[
alias
.
toLowerCase
()]
=
langId
;
this
.
_lowercaseNameMap
[
alias
.
toLowerCase
()]
=
language
.
identifier
;
});
language
.
mimetypes
.
forEach
((
mimetype
)
=>
{
this
.
mime2LanguageId
[
mimetype
]
=
langId
;
this
.
_mimeTypesMap
[
mimetype
]
=
language
.
identifier
;
});
});
Registry
.
as
<
IConfigurationRegistry
>
(
Extensions
.
Configuration
).
registerOverrideIdentifiers
(
ModesRegistry
.
getLanguages
().
map
(
language
=>
language
.
id
));
this
.
_onDidAddModes
.
fire
(
addedModes
);
}
private
_registerLanguage
(
lang
:
ILanguageExtensionPoint
):
void
{
...
...
@@ -95,7 +88,7 @@ export class LanguagesRegistry {
}
else
{
let
languageId
=
this
.
_nextLanguageId
++
;
resolvedLanguage
=
{
id
:
languageId
,
id
entifier
:
new
LanguageIdentifier
(
langId
,
languageId
)
,
name
:
null
,
mimetypes
:
[],
aliases
:
[],
...
...
@@ -103,7 +96,7 @@ export class LanguagesRegistry {
filenames
:
[],
configurationFiles
:
[]
};
this
.
languageIds
[
languageId
]
=
langId
;
this
.
_
languageIds
[
languageId
]
=
langId
;
this
.
_languages
[
langId
]
=
resolvedLanguage
;
}
...
...
@@ -203,7 +196,7 @@ export class LanguagesRegistry {
public
isRegisteredMode
(
mimetypeOrModeId
:
string
):
boolean
{
// Is this a known mime type ?
if
(
hasOwnProperty
.
call
(
this
.
mime2LanguageId
,
mimetypeOrModeId
))
{
if
(
hasOwnProperty
.
call
(
this
.
_mimeTypesMap
,
mimetypeOrModeId
))
{
return
true
;
}
// Is this a known mode id ?
...
...
@@ -215,7 +208,7 @@ export class LanguagesRegistry {
}
public
getRegisteredLanguageNames
():
string
[]
{
return
Object
.
keys
(
this
.
name2LanguageId
);
return
Object
.
keys
(
this
.
_nameMap
);
}
public
getLanguageName
(
modeId
:
string
):
string
{
...
...
@@ -226,7 +219,10 @@ export class LanguagesRegistry {
}
public
getModeIdForLanguageNameLowercase
(
languageNameLower
:
string
):
string
{
return
this
.
lowerName2Id
[
languageNameLower
]
||
null
;
if
(
!
hasOwnProperty
.
call
(
this
.
_lowercaseNameMap
,
languageNameLower
))
{
return
null
;
}
return
this
.
_lowercaseNameMap
[
languageNameLower
].
language
;
}
public
getConfigurationFiles
(
modeId
:
string
):
string
[]
{
...
...
@@ -236,30 +232,28 @@ export class LanguagesRegistry {
return
this
.
_languages
[
modeId
].
configurationFiles
||
[];
}
public
getMimeForMode
(
theModeId
:
string
):
string
{
let
keys
=
Object
.
keys
(
this
.
mime2LanguageId
);
for
(
let
i
=
0
,
len
=
keys
.
length
;
i
<
len
;
i
++
)
{
let
_mime
=
keys
[
i
];
let
modeId
=
this
.
mime2LanguageId
[
_mime
];
if
(
modeId
===
theModeId
)
{
return
_mime
;
}
public
getMimeForMode
(
modeId
:
string
):
string
{
if
(
!
hasOwnProperty
.
call
(
this
.
_languages
,
modeId
))
{
return
null
;
}
return
null
;
const
language
=
this
.
_languages
[
modeId
];
return
(
language
.
mimetypes
[
0
]
||
null
)
;
}
public
extractModeIds
(
commaSeparatedMimetypesOrCommaSeparatedIds
OrName
:
string
):
string
[]
{
if
(
!
commaSeparatedMimetypesOrCommaSeparatedIds
OrName
)
{
public
extractModeIds
(
commaSeparatedMimetypesOrCommaSeparatedIds
:
string
):
string
[]
{
if
(
!
commaSeparatedMimetypesOrCommaSeparatedIds
)
{
return
[];
}
return
(
commaSeparatedMimetypesOrCommaSeparatedIds
OrName
.
commaSeparatedMimetypesOrCommaSeparatedIds
.
split
(
'
,
'
).
map
((
mimeTypeOrIdOrName
)
=>
mimeTypeOrIdOrName
.
trim
()).
map
((
mimeTypeOrIdOrName
)
=>
{
return
this
.
mime2LanguageId
[
mimeTypeOrIdOrName
]
||
mimeTypeOrIdOrName
;
map
((
mimeTypeOrId
)
=>
mimeTypeOrId
.
trim
()).
map
((
mimeTypeOrId
)
=>
{
if
(
hasOwnProperty
.
call
(
this
.
_mimeTypesMap
,
mimeTypeOrId
))
{
return
this
.
_mimeTypesMap
[
mimeTypeOrId
].
language
;
}
return
mimeTypeOrId
;
}).
filter
((
modeId
)
=>
{
return
hasOwnProperty
.
call
(
this
.
_languages
,
modeId
);
...
...
@@ -276,7 +270,7 @@ export class LanguagesRegistry {
if
(
typeof
_modeId
===
'
string
'
)
{
modeId
=
_modeId
;
}
else
{
modeId
=
this
.
languageIds
[
_modeId
];
modeId
=
this
.
_
languageIds
[
_modeId
];
if
(
!
modeId
)
{
return
null
;
}
...
...
@@ -285,15 +279,15 @@ export class LanguagesRegistry {
if
(
!
hasOwnProperty
.
call
(
this
.
_languages
,
modeId
))
{
return
null
;
}
return
new
LanguageIdentifier
(
modeId
,
this
.
_languages
[
modeId
].
id
)
;
return
this
.
_languages
[
modeId
].
identifier
;
}
public
getModeIdsFromLanguageName
(
languageName
:
string
):
string
[]
{
if
(
!
languageName
)
{
return
[];
}
if
(
hasOwnProperty
.
call
(
this
.
name2LanguageId
,
languageName
))
{
return
[
this
.
name2LanguageId
[
languageName
]
];
if
(
hasOwnProperty
.
call
(
this
.
_nameMap
,
languageName
))
{
return
[
this
.
_nameMap
[
languageName
].
language
];
}
return
[];
}
...
...
@@ -307,24 +301,18 @@ export class LanguagesRegistry {
}
public
getExtensions
(
languageName
:
string
):
string
[]
{
let
languageId
=
this
.
name2LanguageId
[
languageName
];
if
(
!
languageId
)
{
return
[];
}
if
(
!
hasOwnProperty
.
call
(
this
.
_languages
,
languageId
))
{
if
(
!
hasOwnProperty
.
call
(
this
.
_nameMap
,
languageName
))
{
return
[];
}
return
this
.
_languages
[
languageId
].
extensions
;
const
languageId
=
this
.
_nameMap
[
languageName
];
return
this
.
_languages
[
languageId
.
language
].
extensions
;
}
public
getFilenames
(
languageName
:
string
):
string
[]
{
let
languageId
=
this
.
name2LanguageId
[
languageName
];
if
(
!
languageId
)
{
return
[];
}
if
(
!
hasOwnProperty
.
call
(
this
.
_languages
,
languageId
))
{
if
(
!
hasOwnProperty
.
call
(
this
.
_nameMap
,
languageName
))
{
return
[];
}
return
this
.
_languages
[
languageId
].
filenames
;
const
languageId
=
this
.
_nameMap
[
languageName
];
return
this
.
_languages
[
languageId
.
language
].
filenames
;
}
}
src/vs/editor/common/services/modeService.ts
浏览文件 @
1744078c
...
...
@@ -41,7 +41,6 @@ export interface IValidLanguageExtensionPoint {
export
interface
IModeService
{
_serviceBrand
:
any
;
onDidAddModes
:
Event
<
string
[]
>
;
onDidCreateMode
:
Event
<
IMode
>
;
// --- reading
...
...
src/vs/editor/common/services/modeServiceImpl.ts
浏览文件 @
1744078c
...
...
@@ -77,21 +77,16 @@ export const languagesExtPoint: IExtensionPoint<ILanguageExtensionPoint[]> = Ext
export
class
ModeServiceImpl
implements
IModeService
{
public
_serviceBrand
:
any
;
private
_instantiatedModes
:
{
[
modeId
:
string
]:
IMode
;
};
private
readonly
_instantiatedModes
:
{
[
modeId
:
string
]:
IMode
;
};
private
readonly
_registry
:
LanguagesRegistry
;
private
_registry
:
LanguagesRegistry
;
private
_onDidAddModes
:
Emitter
<
string
[]
>
=
new
Emitter
<
string
[]
>
();
public
onDidAddModes
:
Event
<
string
[]
>
=
this
.
_onDidAddModes
.
event
;
private
_onDidCreateMode
:
Emitter
<
IMode
>
=
new
Emitter
<
IMode
>
();
public
onDidCreateMode
:
Event
<
IMode
>
=
this
.
_onDidCreateMode
.
event
;
private
readonly
_onDidCreateMode
:
Emitter
<
IMode
>
=
new
Emitter
<
IMode
>
();
public
readonly
onDidCreateMode
:
Event
<
IMode
>
=
this
.
_onDidCreateMode
.
event
;
constructor
()
{
this
.
_instantiatedModes
=
{};
this
.
_registry
=
new
LanguagesRegistry
();
this
.
_registry
.
onDidAddModes
((
modes
)
=>
this
.
_onDidAddModes
.
fire
(
modes
));
}
protected
_onReady
():
TPromise
<
boolean
>
{
...
...
@@ -195,7 +190,7 @@ export class ModeServiceImpl implements IModeService {
}).
done
(
null
,
onUnexpectedError
);
return
r
;
}
return
undefined
;
return
null
;
}
public
getOrCreateMode
(
commaSeparatedMimetypesOrCommaSeparatedIds
:
string
):
TPromise
<
IMode
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录