Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
061f0f5e
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,发现更多精彩内容 >>
提交
061f0f5e
编写于
8月 22, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Small stylistic changes
上级
256d205f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
15 deletion
+22
-15
src/vs/editor/common/config/editorOptions.ts
src/vs/editor/common/config/editorOptions.ts
+1
-1
src/vs/editor/common/controller/cursorCommon.ts
src/vs/editor/common/controller/cursorCommon.ts
+21
-12
src/vs/editor/common/controller/cursorTypeOperations.ts
src/vs/editor/common/controller/cursorTypeOperations.ts
+0
-1
src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
...guageConfiguration/languageConfigurationExtensionPoint.ts
+0
-1
未找到文件。
src/vs/editor/common/config/editorOptions.ts
浏览文件 @
061f0f5e
...
...
@@ -1718,7 +1718,7 @@ export class EditorOptionsValidator {
let
autoClosingBrackets
:
EditorAutoClosingStrategy
;
let
autoClosingQuotes
:
EditorAutoClosingStrategy
;
let
autoWrapping
:
EditorAutoWrappingStrategy
;
if
(
typeof
(
opts
.
autoClosingBrackets
)
===
'
boolean
'
&&
opts
.
autoClosingBrackets
===
false
)
{
if
(
typeof
opts
.
autoClosingBrackets
===
'
boolean
'
&&
opts
.
autoClosingBrackets
===
false
)
{
// backwards compatibility: disable all on boolean false
autoClosingBrackets
=
'
never
'
;
autoClosingQuotes
=
'
never
'
;
...
...
src/vs/editor/common/controller/cursorCommon.ts
浏览文件 @
061f0f5e
...
...
@@ -20,7 +20,6 @@ import { IViewModel } from 'vs/editor/common/viewModel/viewModel';
import
{
CursorChangeReason
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
VerticalRevealType
}
from
'
vs/editor/common/view/viewEvents
'
;
import
{
TextModelResolvedOptions
,
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
CharacterPairSupport
}
from
'
vs/editor/common/modes/supports/characterPair
'
;
export
interface
IColumnSelectData
{
toViewLineNumber
:
number
;
...
...
@@ -67,6 +66,10 @@ export interface CharacterMap {
[
char
:
string
]:
string
;
}
const
autoCloseAlways
=
_
=>
true
;
const
autoCloseNever
=
_
=>
false
;
const
autoCloseBeforeWhitespace
=
(
chr
:
string
)
=>
(
chr
===
'
'
||
chr
===
'
\t
'
);
export
class
CursorConfiguration
{
_cursorMoveConfigurationBrand
:
void
;
...
...
@@ -138,8 +141,8 @@ export class CursorConfiguration {
this
.
_electricChars
=
null
;
this
.
shouldAutoCloseBefore
=
{
quote
:
CursorConfiguration
.
_getShouldAuto
c
lose
(
languageIdentifier
,
this
.
autoClosingQuotes
),
bracket
:
CursorConfiguration
.
_getShouldAuto
c
lose
(
languageIdentifier
,
this
.
autoClosingBrackets
)
quote
:
CursorConfiguration
.
_getShouldAuto
C
lose
(
languageIdentifier
,
this
.
autoClosingQuotes
),
bracket
:
CursorConfiguration
.
_getShouldAuto
C
lose
(
languageIdentifier
,
this
.
autoClosingBrackets
)
};
let
autoClosingPairs
=
CursorConfiguration
.
_getAutoClosingPairs
(
languageIdentifier
);
...
...
@@ -193,20 +196,26 @@ export class CursorConfiguration {
}
}
private
static
_getShouldAutoclose
(
languageIdentifier
:
LanguageIdentifier
,
autoCloseConfig
:
EditorAutoClosingStrategy
):
(
ch
:
string
)
=>
boolean
{
let
autoCloseBeforeSet
=
CursorConfiguration
.
_getAutoCloseBeforeSet
(
languageIdentifier
);
if
(
autoCloseConfig
===
'
beforeWhitespace
'
)
{
return
c
=>
CharacterPairSupport
.
DEFAULT_AUTOCLOSE_BEFORE_WHITESPACE
.
indexOf
(
c
)
!==
-
1
;
}
if
(
autoCloseConfig
===
'
languageDefined
'
)
{
return
c
=>
autoCloseBeforeSet
.
indexOf
(
c
)
!==
-
1
;
}
if
(
autoCloseConfig
===
'
always
'
)
{
return
c
=>
true
;
}
return
c
=>
false
;
private
static
_getShouldAutoClose
(
languageIdentifier
:
LanguageIdentifier
,
autoCloseConfig
:
EditorAutoClosingStrategy
):
(
ch
:
string
)
=>
boolean
{
switch
(
autoCloseConfig
)
{
case
'
beforeWhitespace
'
:
return
autoCloseBeforeWhitespace
;
case
'
languageDefined
'
:
return
CursorConfiguration
.
_getLanguageDefinedShouldAutoClose
(
languageIdentifier
);
case
'
always
'
:
return
autoCloseAlways
;
case
'
never
'
:
return
autoCloseNever
;
}
}
private
static
_get
AutoCloseBeforeSet
(
languageIdentifier
:
LanguageIdentifier
):
string
{
private
static
_get
LanguageDefinedShouldAutoClose
(
languageIdentifier
:
LanguageIdentifier
):
(
ch
:
string
)
=>
boolean
{
try
{
return
LanguageConfigurationRegistry
.
getAutoCloseBeforeSet
(
languageIdentifier
.
id
);
const
autoCloseBeforeSet
=
LanguageConfigurationRegistry
.
getAutoCloseBeforeSet
(
languageIdentifier
.
id
);
return
c
=>
autoCloseBeforeSet
.
indexOf
(
c
)
!==
-
1
;
}
catch
(
e
)
{
onUnexpectedError
(
e
);
return
null
;
return
autoCloseNever
;
}
}
...
...
src/vs/editor/common/controller/cursorTypeOperations.ts
浏览文件 @
061f0f5e
...
...
@@ -532,7 +532,6 @@ export class TypeOperations {
const
position
=
selection
.
getPosition
();
const
lineText
=
model
.
getLineContent
(
position
.
lineNumber
);
// Do not auto-close ' or " after a word character
if
(
chIsQuote
&&
position
.
column
>
1
)
{
const
wordSeparators
=
getMapForWordSeparators
(
config
.
wordSeparators
);
...
...
src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
浏览文件 @
061f0f5e
...
...
@@ -280,7 +280,6 @@ export class LanguageConfigurationFileHandler {
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录