Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
725d2fa1
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,发现更多精彩内容 >>
提交
725d2fa1
编写于
1月 03, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge Model and TextModelWithDecorations
上级
df515972
变更
26
展开全部
隐藏空白更改
内联
并排
Showing
26 changed file
with
626 addition
and
657 deletion
+626
-657
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+1
-1
src/vs/editor/common/commonCodeEditor.ts
src/vs/editor/common/commonCodeEditor.ts
+1
-1
src/vs/editor/common/model/intervalTree.ts
src/vs/editor/common/model/intervalTree.ts
+1
-1
src/vs/editor/common/model/model.ts
src/vs/editor/common/model/model.ts
+601
-14
src/vs/editor/common/model/textModelWithDecorations.ts
src/vs/editor/common/model/textModelWithDecorations.ts
+0
-616
src/vs/editor/common/viewModel/splitLinesCollection.ts
src/vs/editor/common/viewModel/splitLinesCollection.ts
+1
-1
src/vs/editor/common/viewModel/viewModelImpl.ts
src/vs/editor/common/viewModel/viewModelImpl.ts
+1
-1
src/vs/editor/contrib/bracketMatching/bracketMatching.ts
src/vs/editor/contrib/bracketMatching/bracketMatching.ts
+1
-1
src/vs/editor/contrib/codelens/codelensWidget.ts
src/vs/editor/contrib/codelens/codelensWidget.ts
+1
-1
src/vs/editor/contrib/dnd/dnd.ts
src/vs/editor/contrib/dnd/dnd.ts
+1
-1
src/vs/editor/contrib/find/findDecorations.ts
src/vs/editor/contrib/find/findDecorations.ts
+1
-1
src/vs/editor/contrib/folding/foldingDecorations.ts
src/vs/editor/contrib/folding/foldingDecorations.ts
+1
-1
src/vs/editor/contrib/folding/test/foldingModel.test.ts
src/vs/editor/contrib/folding/test/foldingModel.test.ts
+2
-3
src/vs/editor/contrib/hover/modesContentHover.ts
src/vs/editor/contrib/hover/modesContentHover.ts
+1
-1
src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
+1
-1
src/vs/editor/contrib/links/links.ts
src/vs/editor/contrib/links/links.ts
+1
-1
src/vs/editor/contrib/multicursor/multicursor.ts
src/vs/editor/contrib/multicursor/multicursor.ts
+1
-1
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+1
-2
src/vs/editor/contrib/snippet/snippetSession.ts
src/vs/editor/contrib/snippet/snippetSession.ts
+1
-1
src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
+1
-1
src/vs/editor/contrib/zoneWidget/zoneWidget.ts
src/vs/editor/contrib/zoneWidget/zoneWidget.ts
+1
-1
src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
...vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
+1
-1
src/vs/workbench/browser/parts/editor/rangeDecorations.ts
src/vs/workbench/browser/parts/editor/rangeDecorations.ts
+1
-1
src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
...rkbench/parts/preferences/browser/preferencesRenderers.ts
+1
-1
src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
...orkbench/parts/scm/electron-browser/dirtydiffDecorator.ts
+1
-1
src/vs/workbench/parts/search/common/searchModel.ts
src/vs/workbench/parts/search/common/searchModel.ts
+1
-1
未找到文件。
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
725d2fa1
...
...
@@ -38,7 +38,7 @@ import { scrollbarShadow, diffInserted, diffRemoved, defaultInsertColor, default
import
{
Color
}
from
'
vs/base/common/color
'
;
import
{
OverviewRulerZone
}
from
'
vs/editor/common/view/overviewZoneManager
'
;
import
{
IEditorWhitespace
}
from
'
vs/editor/common/viewLayout/whitespaceComputer
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
DiffReview
}
from
'
vs/editor/browser/widget/diffReview
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IMessageService
}
from
'
vs/platform/message/common/message
'
;
...
...
src/vs/editor/common/commonCodeEditor.ts
浏览文件 @
725d2fa1
...
...
@@ -25,7 +25,7 @@ import * as editorOptions from 'vs/editor/common/config/editorOptions';
import
{
ICursorPositionChangedEvent
,
ICursorSelectionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
EditorContextKeys
}
from
'
vs/editor/common/editorContextKeys
'
;
import
{
VerticalRevealType
}
from
'
vs/editor/common/view/viewEvents
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
IEditorWhitespace
}
from
'
vs/editor/common/viewLayout/whitespaceComputer
'
;
import
*
as
modes
from
'
vs/editor/common/modes
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
...
...
src/vs/editor/common/model/intervalTree.ts
浏览文件 @
725d2fa1
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
IModelDecoration
}
from
'
vs/editor/common/editorCommon
'
;
...
...
src/vs/editor/common/model/model.ts
浏览文件 @
725d2fa1
此差异已折叠。
点击以展开。
src/vs/editor/common/model/textModelWithDecorations.ts
已删除
100644 → 0
浏览文件 @
df515972
此差异已折叠。
点击以展开。
src/vs/editor/common/viewModel/splitLinesCollection.ts
浏览文件 @
725d2fa1
...
...
@@ -12,7 +12,7 @@ import { PrefixSumComputerWithCache } from 'vs/editor/common/viewModel/prefixSum
import
{
ViewLineData
,
ICoordinatesConverter
,
IOverviewRulerDecorations
}
from
'
vs/editor/common/viewModel/viewModel
'
;
import
*
as
viewEvents
from
'
vs/editor/common/view/viewEvents
'
;
import
{
WrappingIndent
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
ModelDecorationOptions
,
ModelDecorationOverviewRulerOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
,
ModelDecorationOverviewRulerOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
ThemeColor
,
ITheme
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
Color
}
from
'
vs/base/common/color
'
;
...
...
src/vs/editor/common/viewModel/viewModelImpl.ts
浏览文件 @
725d2fa1
...
...
@@ -22,7 +22,7 @@ import { ViewLayout } from 'vs/editor/common/viewLayout/viewLayout';
import
{
Color
}
from
'
vs/base/common/color
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
ITheme
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
ModelDecorationOverviewRulerOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOverviewRulerOptions
}
from
'
vs/editor/common/model/
model
'
;
const
USE_IDENTITY_LINES_COLLECTION
=
true
;
...
...
src/vs/editor/contrib/bracketMatching/bracketMatching.ts
浏览文件 @
725d2fa1
...
...
@@ -18,7 +18,7 @@ import { registerEditorAction, registerEditorContribution, ServicesAccessor, Edi
import
{
EditorContextKeys
}
from
'
vs/editor/common/editorContextKeys
'
;
import
{
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
editorBracketMatchBackground
,
editorBracketMatchBorder
}
from
'
vs/editor/common/view/editorColorRegistry
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
class
SelectBracketAction
extends
EditorAction
{
...
...
src/vs/editor/contrib/codelens/codelensWidget.ts
浏览文件 @
725d2fa1
...
...
@@ -17,7 +17,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
import
{
ICodeLensSymbol
,
Command
}
from
'
vs/editor/common/modes
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeLensData
}
from
'
./codelens
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
editorCodeLensForeground
}
from
'
vs/editor/common/view/editorColorRegistry
'
;
import
{
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
editorActiveLinkForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
...
...
src/vs/editor/contrib/dnd/dnd.ts
浏览文件 @
725d2fa1
...
...
@@ -17,7 +17,7 @@ import { Position } from 'vs/editor/common/core/position';
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
DragAndDropCommand
}
from
'
vs/editor/contrib/dnd/dragAndDropCommand
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
export
class
DragAndDropController
implements
editorCommon
.
IEditorContribution
{
...
...
src/vs/editor/contrib/find/findDecorations.ts
浏览文件 @
725d2fa1
...
...
@@ -8,7 +8,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
editorFindMatchHighlight
,
editorFindMatch
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
themeColorFromId
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
...
...
src/vs/editor/contrib/folding/foldingDecorations.ts
浏览文件 @
725d2fa1
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
TrackedRangeStickiness
,
IModelDeltaDecoration
,
IModelDecorationsChangeAccessor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
IDecorationProvider
}
from
'
vs/editor/contrib/folding/foldingModel
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
...
...
src/vs/editor/contrib/folding/test/foldingModel.test.ts
浏览文件 @
725d2fa1
...
...
@@ -6,9 +6,8 @@
import
*
as
assert
from
'
assert
'
;
import
{
FoldingModel
,
setCollapseStateAtLevel
,
setCollapseStateLevelsDown
,
setCollapseStateLevelsUp
,
setCollapseStateForMatchingLines
}
from
'
vs/editor/contrib/folding/foldingModel
'
;
import
{
Model
}
from
'
vs/editor/common/model/model
'
;
import
{
Model
,
ModelDecorationOptions
}
from
'
vs/editor/common/model/model
'
;
import
{
computeRanges
}
from
'
vs/editor/contrib/folding/indentRangeProvider
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/textModelWithDecorations
'
;
import
{
TrackedRangeStickiness
,
IModelDeltaDecoration
,
IModel
,
IModelDecorationsChangeAccessor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
...
...
@@ -630,4 +629,4 @@ suite('Folding Model', () => {
});
});
\ No newline at end of file
});
src/vs/editor/contrib/hover/modesContentHover.ts
浏览文件 @
725d2fa1
...
...
@@ -16,7 +16,7 @@ import { HoverOperation, IHoverComputer } from './hoverOperation';
import
{
ContentHoverWidget
}
from
'
./hoverWidgets
'
;
import
{
IMarkdownString
,
MarkdownString
,
isEmptyMarkdownString
,
markedStringsEquals
}
from
'
vs/base/common/htmlContent
'
;
import
{
MarkdownRenderer
}
from
'
vs/editor/contrib/markdown/markdownRenderer
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
ColorPickerModel
}
from
'
vs/editor/contrib/colorPicker/colorPickerModel
'
;
import
{
ColorPickerWidget
}
from
'
vs/editor/contrib/colorPicker/colorPickerWidget
'
;
import
{
ColorDetector
}
from
'
vs/editor/contrib/colorPicker/colorDetector
'
;
...
...
src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
浏览文件 @
725d2fa1
...
...
@@ -18,7 +18,7 @@ import { InPlaceReplaceCommand } from './inPlaceReplaceCommand';
import
{
EditorState
,
CodeEditorStateFlag
}
from
'
vs/editor/browser/core/editorState
'
;
import
{
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
editorBracketMatchBorder
}
from
'
vs/editor/common/view/editorColorRegistry
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
class
InPlaceReplaceController
implements
IEditorContribution
{
...
...
src/vs/editor/contrib/links/links.ts
浏览文件 @
725d2fa1
...
...
@@ -22,7 +22,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import
{
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
editorActiveLinkForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
ClickLinkGesture
,
ClickLinkMouseEvent
,
ClickLinkKeyboardEvent
}
from
'
vs/editor/contrib/goToDeclaration/clickLinkGesture
'
;
import
{
MarkdownString
}
from
'
vs/base/common/htmlContent
'
;
...
...
src/vs/editor/contrib/multicursor/multicursor.ts
浏览文件 @
725d2fa1
...
...
@@ -19,7 +19,7 @@ import { RevealTarget } from 'vs/editor/common/controller/cursorCommon';
import
{
Constants
}
from
'
vs/editor/common/core/uint
'
;
import
{
DocumentHighlightProviderRegistry
}
from
'
vs/editor/common/modes
'
;
import
{
CommonFindController
}
from
'
vs/editor/contrib/find/findController
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
overviewRulerSelectionHighlightForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
themeColorFromId
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
INewFindReplaceState
,
FindOptionOverride
}
from
'
vs/editor/contrib/find/findState
'
;
...
...
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
浏览文件 @
725d2fa1
...
...
@@ -29,7 +29,7 @@ import { IInstantiationService, optional } from 'vs/platform/instantiation/commo
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
Range
,
IRange
}
from
'
vs/editor/common/core/range
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
Model
}
from
'
vs/editor/common/model/model
'
;
import
{
Model
,
ModelDecorationOptions
}
from
'
vs/editor/common/model/model
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
EmbeddedCodeEditorWidget
}
from
'
vs/editor/browser/widget/embeddedCodeEditorWidget
'
;
import
{
PeekViewWidget
}
from
'
./peekViewWidget
'
;
...
...
@@ -40,7 +40,6 @@ import { registerThemingParticipant, ITheme, IThemeService } from 'vs/platform/t
import
{
attachListStyler
,
attachBadgeStyler
}
from
'
vs/platform/theme/common/styler
'
;
import
{
IEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/textModelWithDecorations
'
;
import
URI
from
'
vs/base/common/uri
'
;
class
DecorationsManager
implements
IDisposable
{
...
...
src/vs/editor/contrib/snippet/snippetSession.ts
浏览文件 @
725d2fa1
...
...
@@ -16,7 +16,7 @@ import { IPosition } from 'vs/editor/common/core/position';
import
{
groupBy
}
from
'
vs/base/common/arrays
'
;
import
{
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
SelectionBasedVariableResolver
,
CompositeSnippetVariableResolver
,
ModelBasedVariableResolver
,
ClipboardBasedVariableResolver
}
from
'
./snippetVariables
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
import
{
optional
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
浏览文件 @
725d2fa1
...
...
@@ -18,7 +18,7 @@ import { Position } from 'vs/editor/common/core/position';
import
{
registerColor
,
editorSelectionHighlight
,
activeContrastBorder
,
overviewRulerSelectionHighlightForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
registerThemingParticipant
,
themeColorFromId
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
CursorChangeReason
,
ICursorPositionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
IContextKey
,
IContextKeyService
,
RawContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
{
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
src/vs/editor/contrib/zoneWidget/zoneWidget.ts
浏览文件 @
725d2fa1
...
...
@@ -15,7 +15,7 @@ import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone, IViewZo
import
{
Color
,
RGBA
}
from
'
vs/base/common/color
'
;
import
{
EditorLayoutInfo
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
Position
,
IPosition
}
from
'
vs/editor/common/core/position
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
IdGenerator
}
from
'
vs/base/common/idGenerator
'
;
import
{
ScrollType
,
TrackedRangeStickiness
}
from
'
vs/editor/common/editorCommon
'
;
...
...
src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts
浏览文件 @
725d2fa1
...
...
@@ -13,7 +13,7 @@ import { Selection } from 'vs/editor/common/core/selection';
import
{
registerEditorContribution
,
IActionOptions
,
EditorAction
}
from
'
vs/editor/browser/editorExtensions
'
;
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
export
interface
IQuickOpenControllerOpts
{
inputAriaLabel
:
string
;
...
...
src/vs/workbench/browser/parts/editor/rangeDecorations.ts
浏览文件 @
725d2fa1
...
...
@@ -10,7 +10,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IRange
}
from
'
vs/editor/common/core/range
'
;
import
{
CursorChangeReason
,
ICursorPositionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
export
interface
IRangeHighlightDecoration
{
...
...
src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
浏览文件 @
725d2fa1
...
...
@@ -28,7 +28,7 @@ import { IMarkerService, IMarkerData } from 'vs/platform/markers/common/markers'
import
{
IMessageService
,
Severity
}
from
'
vs/platform/message/common/message
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ICursorPositionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
IWorkspaceContextService
,
WorkbenchState
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
MarkdownString
}
from
'
vs/base/common/htmlContent
'
;
import
{
overrideIdentifierFromKey
,
IConfigurationService
,
ConfigurationTarget
}
from
'
vs/platform/configuration/common/configuration
'
;
...
...
src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
浏览文件 @
725d2fa1
...
...
@@ -23,7 +23,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
URI
from
'
vs/base/common/uri
'
;
import
{
IEditorGroupService
}
from
'
vs/workbench/services/group/common/groupService
'
;
import
{
ISCMService
,
ISCMRepository
}
from
'
vs/workbench/services/scm/common/scm
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
registerThemingParticipant
,
ITheme
,
ICssStyleCollector
,
themeColorFromId
,
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
registerColor
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
localize
}
from
'
vs/nls
'
;
...
...
src/vs/workbench/parts/search/common/searchModel.ts
浏览文件 @
725d2fa1
...
...
@@ -21,7 +21,7 @@ import { IInstantiationService, createDecorator } from 'vs/platform/instantiatio
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
IReplaceService
}
from
'
vs/workbench/parts/search/common/replace
'
;
import
{
IProgressRunner
}
from
'
vs/platform/progress/common/progress
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
textModelWithDecorations
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/
model
'
;
import
{
overviewRulerFindMatchForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
themeColorFromId
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
getBaseLabel
}
from
'
vs/base/common/labels
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录