Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
67bbb46e
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,发现更多精彩内容 >>
提交
67bbb46e
编写于
8月 24, 2016
作者:
E
Erich Gamma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Partial fix for #9500
上级
673d75e7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
6 deletion
+22
-6
src/vs/workbench/parts/emmet/node/editorAccessor.ts
src/vs/workbench/parts/emmet/node/editorAccessor.ts
+19
-3
src/vs/workbench/parts/emmet/node/emmetActions.ts
src/vs/workbench/parts/emmet/node/emmetActions.ts
+3
-3
未找到文件。
src/vs/workbench/parts/emmet/node/editorAccessor.ts
浏览文件 @
67bbb46e
...
...
@@ -16,18 +16,20 @@ import emmet = require('emmet');
export
class
EditorAccessor
implements
emmet
.
Editor
{
editor
:
ICommonCodeEditor
;
syntaxProfiles
:
any
;
private
_hasMadeEdits
:
boolean
;
emmetSupportedModes
=
[
'
html
'
,
'
razor
'
,
'
css
'
,
'
less
'
,
'
sass
'
,
'
scss
'
,
'
stylus
'
,
'
xml
'
,
'
xsl
'
,
'
jade
'
,
'
handlebars
'
,
'
ejs
'
,
'
hbs
'
,
'
jsx
'
,
'
tsx
'
,
'
erb
'
,
'
php
'
,
'
twig
'
];
constructor
(
editor
:
ICommonCodeEditor
)
{
constructor
(
editor
:
ICommonCodeEditor
,
syntaxProfiles
:
any
)
{
this
.
editor
=
editor
;
this
.
syntaxProfiles
=
syntaxProfiles
;
this
.
_hasMadeEdits
=
false
;
}
public
isEmmetEnabledMode
():
boolean
{
let
syntax
=
this
.
getSyntax
();
return
(
this
.
emmetSupportedModes
.
indexOf
(
syntax
)
!==
-
1
);
return
this
.
emmetSupportedModes
.
indexOf
(
this
.
getSyntax
())
!==
-
1
;
}
public
getSelectionRange
():
emmet
.
Range
{
...
...
@@ -119,6 +121,13 @@ export class EditorAccessor implements emmet.Editor {
let
position
=
this
.
editor
.
getSelection
().
getStartPosition
();
let
modeId
=
this
.
editor
.
getModel
().
getModeIdAtPosition
(
position
.
lineNumber
,
position
.
column
);
let
syntax
=
modeId
.
split
(
'
.
'
).
pop
();
// user can overwrite the syntax using the emmet syntaxProfiles setting
let
profile
=
this
.
getSyntaxProfile
(
syntax
);
if
(
profile
)
{
return
profile
;
}
if
(
/
\b(
razor|handlebars|erb|php|hbs|ejs|twig
)\b
/
.
test
(
syntax
))
{
// treat like html
return
'
html
'
;
}
...
...
@@ -131,6 +140,13 @@ export class EditorAccessor implements emmet.Editor {
return
syntax
;
}
private
getSyntaxProfile
(
syntax
:
string
):
string
{
const
profile
=
this
.
syntaxProfiles
[
syntax
];
if
(
profile
&&
typeof
profile
===
'
string
'
)
{
return
profile
;
}
}
public
getProfileName
():
string
{
return
null
;
}
...
...
src/vs/workbench/parts/emmet/node/emmetActions.ts
浏览文件 @
67bbb46e
...
...
@@ -61,9 +61,9 @@ class LazyEmmet {
_emmet
.
preferences
.
define
(
key
,
preferences
[
key
]);
}
}
let
syntaxProfile
=
configurationService
.
getConfiguration
<
IEmmetConfiguration
>
().
emmet
.
syntaxProfiles
;
let
syntaxProfile
s
=
configurationService
.
getConfiguration
<
IEmmetConfiguration
>
().
emmet
.
syntaxProfiles
;
_emmet
.
profile
.
reset
();
_emmet
.
loadProfiles
(
syntaxProfile
);
_emmet
.
loadProfiles
(
syntaxProfile
s
);
}
private
resetEmmetPreferences
(
configurationService
:
IConfigurationService
,
_emmet
:
typeof
emmet
)
{
...
...
@@ -110,7 +110,7 @@ export abstract class EmmetEditorAction extends EditorAction {
const
configurationService
=
accessor
.
get
(
IConfigurationService
);
const
instantiationService
=
accessor
.
get
(
IInstantiationService
);
let
editorAccessor
=
new
EditorAccessor
(
editor
);
let
editorAccessor
=
new
EditorAccessor
(
editor
,
configurationService
.
getConfiguration
<
IEmmetConfiguration
>
().
emmet
.
syntaxProfiles
);
if
(
!
editorAccessor
.
isEmmetEnabledMode
())
{
this
.
noExpansionOccurred
(
editor
);
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录