Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
70875e2e
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,发现更多精彩内容 >>
提交
70875e2e
编写于
7月 23, 2018
作者:
J
Jackson Kearl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix language defined config
上级
efbb2fbc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
3 deletion
+11
-3
src/vs/editor/common/modes/languageConfigurationRegistry.ts
src/vs/editor/common/modes/languageConfigurationRegistry.ts
+2
-1
src/vs/editor/common/modes/supports/characterPair.ts
src/vs/editor/common/modes/supports/characterPair.ts
+2
-2
src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
...guageConfiguration/languageConfigurationExtensionPoint.ts
+7
-0
未找到文件。
src/vs/editor/common/modes/languageConfigurationRegistry.ts
浏览文件 @
70875e2e
...
...
@@ -119,6 +119,7 @@ export class RichEditSupport {
onEnterRules
:
(
prev
?
current
.
onEnterRules
||
prev
.
onEnterRules
:
current
.
onEnterRules
),
autoClosingPairs
:
(
prev
?
current
.
autoClosingPairs
||
prev
.
autoClosingPairs
:
current
.
autoClosingPairs
),
surroundingPairs
:
(
prev
?
current
.
surroundingPairs
||
prev
.
surroundingPairs
:
current
.
surroundingPairs
),
autoCloseBefore
:
(
prev
?
current
.
autoCloseBefore
||
prev
.
autoCloseBefore
:
current
.
autoCloseBefore
),
folding
:
(
prev
?
current
.
folding
||
prev
.
folding
:
current
.
folding
),
__electricCharacterSupport
:
(
prev
?
current
.
__electricCharacterSupport
||
prev
.
__electricCharacterSupport
:
current
.
__electricCharacterSupport
),
};
...
...
@@ -274,7 +275,7 @@ export class LanguageConfigurationRegistryImpl {
public
getAutoCloseBeforeSet
(
languageId
:
LanguageId
):
string
{
let
characterPairSupport
=
this
.
_getCharacterPairSupport
(
languageId
);
if
(
!
characterPairSupport
)
{
return
CharacterPairSupport
.
DEFAULT_AUTOCLOSE_BEFORE_LANGAGE_DEFINED
;
return
CharacterPairSupport
.
DEFAULT_AUTOCLOSE_BEFORE_LANG
U
AGE_DEFINED
;
}
return
characterPairSupport
.
getAutoCloseBeforeSet
();
}
...
...
src/vs/editor/common/modes/supports/characterPair.ts
浏览文件 @
70875e2e
...
...
@@ -9,7 +9,7 @@ import { CharacterPair, IAutoClosingPair, IAutoClosingPairConditional, StandardA
export
class
CharacterPairSupport
{
static
readonly
DEFAULT_AUTOCLOSE_BEFORE_LANGAGE_DEFINED
=
'
;:.,=}])>
\n\t
'
;
static
readonly
DEFAULT_AUTOCLOSE_BEFORE_LANG
U
AGE_DEFINED
=
'
;:.,=}])>
\n\t
'
;
static
readonly
DEFAULT_AUTOCLOSE_BEFORE_WHITESPACE
=
'
\n\t
'
;
private
readonly
_autoClosingPairs
:
StandardAutoClosingPairConditional
[];
...
...
@@ -25,7 +25,7 @@ export class CharacterPairSupport {
this
.
_autoClosingPairs
=
[];
}
this
.
_autoCloseBefore
=
typeof
config
.
autoCloseBefore
===
'
string
'
?
config
.
autoCloseBefore
:
CharacterPairSupport
.
DEFAULT_AUTOCLOSE_BEFORE_LANGAGE_DEFINED
;
this
.
_autoCloseBefore
=
typeof
config
.
autoCloseBefore
===
'
string
'
?
config
.
autoCloseBefore
:
CharacterPairSupport
.
DEFAULT_AUTOCLOSE_BEFORE_LANG
U
AGE_DEFINED
;
this
.
_surroundingPairs
=
config
.
surroundingPairs
||
this
.
_autoClosingPairs
;
}
...
...
src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
浏览文件 @
70875e2e
...
...
@@ -38,6 +38,7 @@ interface ILanguageConfiguration {
wordPattern
?:
string
|
IRegExp
;
indentationRules
?:
IIndentationRules
;
folding
?:
FoldingRules
;
autoCloseBefore
?:
string
;
}
function
isStringArr
(
something
:
string
[]):
boolean
{
...
...
@@ -274,6 +275,12 @@ export class LanguageConfigurationFileHandler {
richEditConfig
.
surroundingPairs
=
surroundingPairs
;
}
const
autoCloseBefore
=
configuration
.
autoCloseBefore
;
if
(
typeof
autoCloseBefore
===
'
string
'
)
{
richEditConfig
.
autoCloseBefore
=
autoCloseBefore
;
}
if
(
configuration
.
wordPattern
)
{
try
{
let
wordPattern
=
this
.
_parseRegex
(
configuration
.
wordPattern
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录