Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7f48a9b8
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,发现更多精彩内容 >>
提交
7f48a9b8
编写于
6月 29, 2016
作者:
E
Erich Gamma
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tweaked the PR
上级
479470f9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
11 deletion
+12
-11
src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts
.../workbench/parts/emmet/node/actions/expandAbbreviation.ts
+6
-2
src/vs/workbench/parts/emmet/node/editorAccessor.ts
src/vs/workbench/parts/emmet/node/editorAccessor.ts
+0
-7
src/vs/workbench/parts/emmet/node/emmetActions.ts
src/vs/workbench/parts/emmet/node/emmetActions.ts
+6
-2
未找到文件。
src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts
浏览文件 @
7f48a9b8
...
@@ -9,7 +9,6 @@ import nls = require('vs/nls');
...
@@ -9,7 +9,6 @@ import nls = require('vs/nls');
import
{
BasicEmmetEditorAction
}
from
'
vs/workbench/parts/emmet/node/emmetActions
'
;
import
{
BasicEmmetEditorAction
}
from
'
vs/workbench/parts/emmet/node/emmetActions
'
;
import
{
CommonEditorRegistry
,
EditorActionDescriptor
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
CommonEditorRegistry
,
EditorActionDescriptor
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
IEditorActionDescriptorData
,
ICommonCodeEditor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
editorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
editorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
...
@@ -21,9 +20,14 @@ class ExpandAbbreviationAction extends BasicEmmetEditorAction {
...
@@ -21,9 +20,14 @@ class ExpandAbbreviationAction extends BasicEmmetEditorAction {
static
ID
=
'
editor.emmet.action.expandAbbreviation
'
;
static
ID
=
'
editor.emmet.action.expandAbbreviation
'
;
constructor
(
descriptor
:
IEditorActionDescriptorData
,
editor
:
ICommonCodeEditor
,
@
IConfigurationService
configurationService
:
IConfigurationService
)
{
constructor
(
descriptor
:
editorCommon
.
IEditorActionDescriptorData
,
editor
:
editorCommon
.
ICommonCodeEditor
,
@
IConfigurationService
configurationService
:
IConfigurationService
)
{
super
(
descriptor
,
editor
,
configurationService
,
'
expand_abbreviation
'
);
super
(
descriptor
,
editor
,
configurationService
,
'
expand_abbreviation
'
);
}
}
public
noExpansionOccurred
(
actionId
?:
string
):
void
{
// forward the tab key back to the editor
this
.
editor
.
trigger
(
'
emmet
'
,
editorCommon
.
Handler
.
Tab
,
{});
}
}
}
CommonEditorRegistry
.
registerEditorAction
(
new
EditorActionDescriptor
(
ExpandAbbreviationAction
,
CommonEditorRegistry
.
registerEditorAction
(
new
EditorActionDescriptor
(
ExpandAbbreviationAction
,
...
...
src/vs/workbench/parts/emmet/node/editorAccessor.ts
浏览文件 @
7f48a9b8
...
@@ -23,13 +23,6 @@ export class EditorAccessor implements emmet.Editor {
...
@@ -23,13 +23,6 @@ export class EditorAccessor implements emmet.Editor {
this
.
editor
=
editor
;
this
.
editor
=
editor
;
}
}
public
noExpansionOccurred
(
actionId
?:
string
):
void
{
// return the tab key handling back to the editor only for Expand Abbreviation command
if
(
actionId
===
'
editor.emmet.action.expandAbbreviation
'
)
{
this
.
editor
.
trigger
(
'
emmet
'
,
Handler
.
Tab
,
{});
}
}
public
isEmmetEnabledMode
():
boolean
{
public
isEmmetEnabledMode
():
boolean
{
let
syntax
=
this
.
getSyntax
();
let
syntax
=
this
.
getSyntax
();
return
(
this
.
emmetSupportedModes
.
indexOf
(
syntax
)
!==
-
1
);
return
(
this
.
emmetSupportedModes
.
indexOf
(
syntax
)
!==
-
1
);
...
...
src/vs/workbench/parts/emmet/node/emmetActions.ts
浏览文件 @
7f48a9b8
...
@@ -61,6 +61,10 @@ export abstract class EmmetEditorAction extends EditorAction {
...
@@ -61,6 +61,10 @@ export abstract class EmmetEditorAction extends EditorAction {
abstract
runEmmetAction
(
_emmet
:
any
);
abstract
runEmmetAction
(
_emmet
:
any
);
protected
noExpansionOccurred
()
{
// default do nothing
}
public
run
():
TPromise
<
boolean
>
{
public
run
():
TPromise
<
boolean
>
{
return
new
TPromise
((
c
,
e
)
=>
{
return
new
TPromise
((
c
,
e
)
=>
{
require
([
'
emmet
'
],
(
_emmet
)
=>
{
require
([
'
emmet
'
],
(
_emmet
)
=>
{
...
@@ -68,7 +72,7 @@ export abstract class EmmetEditorAction extends EditorAction {
...
@@ -68,7 +72,7 @@ export abstract class EmmetEditorAction extends EditorAction {
try
{
try
{
if
(
!
this
.
editorAccessor
.
isEmmetEnabledMode
())
{
if
(
!
this
.
editorAccessor
.
isEmmetEnabledMode
())
{
this
.
editorAccessor
.
noExpansionOccurred
(
this
.
id
);
this
.
noExpansionOccurred
(
);
return
;
return
;
}
}
this
.
updateEmmetPreferences
(
_emmet
);
this
.
updateEmmetPreferences
(
_emmet
);
...
@@ -95,7 +99,7 @@ export class BasicEmmetEditorAction extends EmmetEditorAction {
...
@@ -95,7 +99,7 @@ export class BasicEmmetEditorAction extends EmmetEditorAction {
public
runEmmetAction
(
_emmet
)
{
public
runEmmetAction
(
_emmet
)
{
if
(
!
_emmet
.
run
(
this
.
emmetActionName
,
this
.
editorAccessor
))
{
if
(
!
_emmet
.
run
(
this
.
emmetActionName
,
this
.
editorAccessor
))
{
this
.
editorAccessor
.
noExpansionOccurred
();
this
.
noExpansionOccurred
();
}
}
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录