Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2fc7c60b
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,发现更多精彩内容 >>
未验证
提交
2fc7c60b
编写于
1月 24, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix editor validation decorations (#89057)
上级
c7cc30ca
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
9 deletion
+9
-9
src/vs/editor/browser/widget/codeEditorWidget.ts
src/vs/editor/browser/widget/codeEditorWidget.ts
+2
-2
src/vs/editor/common/config/editorOptions.ts
src/vs/editor/common/config/editorOptions.ts
+3
-3
src/vs/editor/common/viewModel/viewModelDecorations.ts
src/vs/editor/common/viewModel/viewModelDecorations.ts
+2
-2
src/vs/editor/common/viewModel/viewModelImpl.ts
src/vs/editor/common/viewModel/viewModelImpl.ts
+2
-2
未找到文件。
src/vs/editor/browser/widget/codeEditorWidget.ts
浏览文件 @
2fc7c60b
...
...
@@ -22,7 +22,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
import
{
ICommandDelegate
}
from
'
vs/editor/browser/view/viewController
'
;
import
{
IContentWidgetData
,
IOverlayWidgetData
,
View
}
from
'
vs/editor/browser/view/viewImpl
'
;
import
{
ViewOutgoingEvents
}
from
'
vs/editor/browser/view/viewOutgoingEvents
'
;
import
{
ConfigurationChangedEvent
,
EditorLayoutInfo
,
IEditorOptions
,
EditorOption
,
IComputedEditorOptions
,
FindComputedEditorOptionValueById
,
IEditorConstructionOptions
,
shouldRend
erValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
ConfigurationChangedEvent
,
EditorLayoutInfo
,
IEditorOptions
,
EditorOption
,
IComputedEditorOptions
,
FindComputedEditorOptionValueById
,
IEditorConstructionOptions
,
filt
erValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
Cursor
,
CursorStateChangedEvent
}
from
'
vs/editor/common/controller/cursor
'
;
import
{
CursorColumns
,
ICursors
}
from
'
vs/editor/common/controller/cursorCommon
'
;
import
{
ICursorPositionChangedEvent
,
ICursorSelectionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
...
...
@@ -1064,7 +1064,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
if
(
!
this
.
_modelData
)
{
return
null
;
}
return
this
.
_modelData
.
model
.
getLineDecorations
(
lineNumber
,
this
.
_id
,
shouldRend
erValidationDecorations
(
this
.
_configuration
.
options
));
return
this
.
_modelData
.
model
.
getLineDecorations
(
lineNumber
,
this
.
_id
,
filt
erValidationDecorations
(
this
.
_configuration
.
options
));
}
public
deltaDecorations
(
oldDecorations
:
string
[],
newDecorations
:
IModelDeltaDecoration
[]):
string
[]
{
...
...
src/vs/editor/common/config/editorOptions.ts
浏览文件 @
2fc7c60b
...
...
@@ -2344,12 +2344,12 @@ class EditorRenderLineNumbersOption extends BaseEditorOption<EditorOption.lineNu
/**
* @internal
*/
export
function
shouldRend
erValidationDecorations
(
options
:
IComputedEditorOptions
):
boolean
{
export
function
filt
erValidationDecorations
(
options
:
IComputedEditorOptions
):
boolean
{
const
renderValidationDecorations
=
options
.
get
(
EditorOption
.
renderValidationDecorations
);
if
(
renderValidationDecorations
===
'
editable
'
)
{
return
!
options
.
get
(
EditorOption
.
readOnly
);
return
options
.
get
(
EditorOption
.
readOnly
);
}
return
renderValidationDecorations
===
'
on
'
?
true
:
fals
e
;
return
renderValidationDecorations
===
'
on
'
?
false
:
tru
e
;
}
//#endregion
...
...
src/vs/editor/common/viewModel/viewModelDecorations.ts
浏览文件 @
2fc7c60b
...
...
@@ -10,7 +10,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
import
{
IModelDecoration
,
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
IViewModelLinesCollection
}
from
'
vs/editor/common/viewModel/splitLinesCollection
'
;
import
{
ICoordinatesConverter
,
InlineDecoration
,
InlineDecorationType
,
ViewModelDecoration
}
from
'
vs/editor/common/viewModel/viewModel
'
;
import
{
shouldRend
erValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
filt
erValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
export
interface
IDecorationsViewportData
{
/**
...
...
@@ -104,7 +104,7 @@ export class ViewModelDecorations implements IDisposable {
}
private
_getDecorationsViewportData
(
viewportRange
:
Range
):
IDecorationsViewportData
{
const
modelDecorations
=
this
.
_linesCollection
.
getDecorationsInRange
(
viewportRange
,
this
.
editorId
,
shouldRend
erValidationDecorations
(
this
.
configuration
.
options
));
const
modelDecorations
=
this
.
_linesCollection
.
getDecorationsInRange
(
viewportRange
,
this
.
editorId
,
filt
erValidationDecorations
(
this
.
configuration
.
options
));
const
startLineNumber
=
viewportRange
.
startLineNumber
;
const
endLineNumber
=
viewportRange
.
endLineNumber
;
...
...
src/vs/editor/common/viewModel/viewModelImpl.ts
浏览文件 @
2fc7c60b
...
...
@@ -6,7 +6,7 @@
import
{
Color
}
from
'
vs/base/common/color
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
ConfigurationChangedEvent
,
EDITOR_FONT_DEFAULTS
,
EditorOption
,
shouldRend
erValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
ConfigurationChangedEvent
,
EDITOR_FONT_DEFAULTS
,
EditorOption
,
filt
erValidationDecorations
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
IPosition
,
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
IRange
,
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
IConfiguration
,
IViewState
}
from
'
vs/editor/common/editorCommon
'
;
...
...
@@ -596,7 +596,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
}
public
getAllOverviewRulerDecorations
(
theme
:
ITheme
):
IOverviewRulerDecorations
{
return
this
.
lines
.
getAllOverviewRulerDecorations
(
this
.
editorId
,
shouldRend
erValidationDecorations
(
this
.
configuration
.
options
),
theme
);
return
this
.
lines
.
getAllOverviewRulerDecorations
(
this
.
editorId
,
filt
erValidationDecorations
(
this
.
configuration
.
options
),
theme
);
}
public
invalidateOverviewRulerColorCache
():
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录