Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
42451b5f
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,发现更多精彩内容 >>
提交
42451b5f
编写于
2月 05, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More tslint
上级
9367be9a
变更
41
显示空白变更内容
内联
并排
Showing
41 changed file
with
31 addition
and
115 deletion
+31
-115
src/vs/base/common/diff/diff2.ts
src/vs/base/common/diff/diff2.ts
+1
-1
src/vs/base/common/worker/workerProtocol.ts
src/vs/base/common/worker/workerProtocol.ts
+0
-1
src/vs/base/test/browser/mockDom.ts
src/vs/base/test/browser/mockDom.ts
+0
-1
src/vs/editor/browser/controller/keyboardHandler.ts
src/vs/editor/browser/controller/keyboardHandler.ts
+1
-7
src/vs/editor/browser/controller/mouseHandler.ts
src/vs/editor/browser/controller/mouseHandler.ts
+0
-1
src/vs/editor/browser/editorBrowser.ts
src/vs/editor/browser/editorBrowser.ts
+0
-2
src/vs/editor/browser/editorBrowserExtensions.ts
src/vs/editor/browser/editorBrowserExtensions.ts
+0
-4
src/vs/editor/browser/services/codeEditorServiceImpl.ts
src/vs/editor/browser/services/codeEditorServiceImpl.ts
+1
-5
src/vs/editor/browser/standalone/simpleServices.ts
src/vs/editor/browser/standalone/simpleServices.ts
+2
-4
src/vs/editor/browser/standalone/standaloneCodeEditor.ts
src/vs/editor/browser/standalone/standaloneCodeEditor.ts
+0
-4
src/vs/editor/browser/standalone/standaloneEditor.ts
src/vs/editor/browser/standalone/standaloneEditor.ts
+1
-1
src/vs/editor/browser/standalone/standaloneServices.ts
src/vs/editor/browser/standalone/standaloneServices.ts
+0
-2
src/vs/editor/browser/view/viewImpl.ts
src/vs/editor/browser/view/viewImpl.ts
+0
-1
src/vs/editor/browser/view/viewLayer.ts
src/vs/editor/browser/view/viewLayer.ts
+0
-1
src/vs/editor/browser/view/viewOverlays.ts
src/vs/editor/browser/view/viewOverlays.ts
+0
-1
src/vs/editor/browser/viewLayout/layoutProvider.ts
src/vs/editor/browser/viewLayout/layoutProvider.ts
+0
-2
src/vs/editor/browser/viewLayout/scrollManager.ts
src/vs/editor/browser/viewLayout/scrollManager.ts
+0
-1
src/vs/editor/browser/widget/codeEditorWidget.ts
src/vs/editor/browser/widget/codeEditorWidget.ts
+0
-2
src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
...s/editor/common/commands/trimTrailingWhitespaceCommand.ts
+0
-1
src/vs/editor/common/commonCodeEditor.ts
src/vs/editor/common/commonCodeEditor.ts
+0
-1
src/vs/editor/common/controller/oneCursor.ts
src/vs/editor/common/controller/oneCursor.ts
+4
-4
src/vs/editor/common/controller/textAreaState.ts
src/vs/editor/common/controller/textAreaState.ts
+2
-2
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+3
-3
src/vs/editor/common/model/editStack.ts
src/vs/editor/common/model/editStack.ts
+0
-1
src/vs/editor/common/model/editableTextModel.ts
src/vs/editor/common/model/editableTextModel.ts
+2
-4
src/vs/editor/common/model/mirrorModel.ts
src/vs/editor/common/model/mirrorModel.ts
+0
-14
src/vs/editor/common/model/model.ts
src/vs/editor/common/model/model.ts
+0
-1
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+0
-13
src/vs/editor/common/model/textModelWithDecorations.ts
src/vs/editor/common/model/textModelWithDecorations.ts
+4
-4
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+1
-1
src/vs/editor/common/modes/TMState.ts
src/vs/editor/common/modes/TMState.ts
+0
-1
src/vs/editor/common/modes/abstractMode.ts
src/vs/editor/common/modes/abstractMode.ts
+2
-2
src/vs/editor/common/modes/abstractModeWorker.ts
src/vs/editor/common/modes/abstractModeWorker.ts
+1
-2
src/vs/editor/common/modes/autoIndentation.ts
src/vs/editor/common/modes/autoIndentation.ts
+1
-1
src/vs/editor/common/modes/languageExtensionPoint.ts
src/vs/editor/common/modes/languageExtensionPoint.ts
+0
-9
src/vs/editor/common/modes/languageFeatureRegistry.ts
src/vs/editor/common/modes/languageFeatureRegistry.ts
+1
-1
src/vs/editor/common/modes/modesRegistry.ts
src/vs/editor/common/modes/modesRegistry.ts
+1
-4
src/vs/editor/common/modes/nullMode.ts
src/vs/editor/common/modes/nullMode.ts
+0
-1
src/vs/editor/common/modes/supports.ts
src/vs/editor/common/modes/supports.ts
+0
-1
src/vs/editor/common/viewModel/viewModelDecorations.ts
src/vs/editor/common/viewModel/viewModelDecorations.ts
+2
-2
src/vs/editor/node/languageConfiguration.ts
src/vs/editor/node/languageConfiguration.ts
+1
-1
未找到文件。
src/vs/base/common/diff/diff2.ts
浏览文件 @
42451b5f
...
...
@@ -139,7 +139,7 @@ export class LcsDiff2 {
return
this
.
ids_for_x
[
xIndex
]
===
this
.
ids_for_y
[
yIndex
];
}
p
rivate
ComputeDiff
():
IDiffChange
[]
{
p
ublic
ComputeDiff
():
IDiffChange
[]
{
let
xLength
=
this
.
x
.
getLength
();
let
yLength
=
this
.
y
.
getLength
();
...
...
src/vs/base/common/worker/workerProtocol.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
marshalling
=
require
(
'
vs/base/common/marshalling
'
);
import
remote
=
require
(
'
vs/base/common/remote
'
);
/**
...
...
src/vs/base/test/browser/mockDom.ts
浏览文件 @
42451b5f
...
...
@@ -729,7 +729,6 @@ class AttributeParser implements IParserState {
class
AttributeValueParser
implements
IParserState
{
public
name
:
string
;
private
attribute
:
AttributeParser
;
private
attributeName
:
string
;
private
value
:
string
;
private
quote
:
boolean
;
...
...
src/vs/editor/browser/controller/keyboardHandler.ts
浏览文件 @
42451b5f
...
...
@@ -6,20 +6,14 @@
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
DomUtils
=
require
(
'
vs/base/browser/dom
'
);
import
Platform
=
require
(
'
vs/base/common/platform
'
);
import
Browser
=
require
(
'
vs/base/browser/browser
'
);
import
EditorBrowser
=
require
(
'
vs/editor/browser/editorBrowser
'
);
import
EventEmitter
=
require
(
'
vs/base/common/eventEmitter
'
);
import
{
ViewEventHandler
}
from
'
vs/editor/common/viewModel/viewEventHandler
'
;
import
Schedulers
=
require
(
'
vs/base/common/async
'
);
import
*
as
Lifecycle
from
'
vs/base/common/lifecycle
'
;
import
Strings
=
require
(
'
vs/base/common/strings
'
);
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
CommonKeybindings
}
from
'
vs/base/common/keyCodes
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
TextAreaHandler
}
from
'
vs/editor/common/controller/textAreaHandler
'
;
import
{
ITextAreaWrapper
,
IClipboardEvent
,
IKeyboardEventWrapper
,
ISimpleModel
,
TextAreaStrategy
}
from
'
vs/editor/common/controller/textAreaState
'
;
import
{
ITextAreaWrapper
,
IClipboardEvent
,
IKeyboardEventWrapper
,
TextAreaStrategy
}
from
'
vs/editor/common/controller/textAreaState
'
;
import
{
GlobalScreenReaderNVDA
}
from
'
vs/editor/common/config/commonEditorConfig
'
;
import
{
StyleMutator
}
from
'
vs/base/browser/styleMutator
'
;
...
...
src/vs/editor/browser/controller/mouseHandler.ts
浏览文件 @
42451b5f
...
...
@@ -10,7 +10,6 @@ import EditorCommon = require('vs/editor/common/editorCommon');
import
Mouse
=
require
(
'
vs/base/browser/mouseEvent
'
);
import
DomUtils
=
require
(
'
vs/base/browser/dom
'
);
import
EditorBrowser
=
require
(
'
vs/editor/browser/editorBrowser
'
);
import
EventEmitter
=
require
(
'
vs/base/common/eventEmitter
'
);
import
MouseTarget
=
require
(
'
vs/editor/browser/controller/mouseTarget
'
);
import
{
ViewEventHandler
}
from
'
vs/editor/common/viewModel/viewEventHandler
'
;
import
Lifecycle
=
require
(
'
vs/base/common/lifecycle
'
);
...
...
src/vs/editor/browser/editorBrowser.ts
浏览文件 @
42451b5f
...
...
@@ -4,8 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
Actions
=
require
(
'
vs/base/common/actions
'
);
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
EventEmitter
=
require
(
'
vs/base/common/eventEmitter
'
);
import
Lifecycle
=
require
(
'
vs/base/common/lifecycle
'
);
...
...
src/vs/editor/browser/editorBrowserExtensions.ts
浏览文件 @
42451b5f
...
...
@@ -4,13 +4,9 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
EditorBrowser
=
require
(
'
vs/editor/browser/editorBrowser
'
);
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Platform
=
require
(
'
vs/platform/platform
'
);
import
Errors
=
require
(
'
vs/base/common/errors
'
);
import
Strings
=
require
(
'
vs/base/common/strings
'
);
import
config
=
require
(
'
vs/editor/common/config/config
'
);
import
{
IInstantiationService
,
INewConstructorSignature1
}
from
'
vs/platform/instantiation/common/instantiation
'
;
export
namespace
EditorBrowserRegistry
{
...
...
src/vs/editor/browser/services/codeEditorServiceImpl.ts
浏览文件 @
42451b5f
...
...
@@ -4,17 +4,13 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
ICommonCodeEditor
,
IThemeDecorationRenderOptions
,
IDecorationRenderOptions
,
IModelDecorationOptions
,
IModelDecorationOverviewRulerOptions
,
OverviewRulerLane
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IHTMLContentElement
}
from
'
vs/base/common/htmlContent
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/common/services/codeEditorService
'
;
import
{
AbstractCodeEditorService
}
from
'
vs/editor/common/services/abstractCodeEditorService
'
;
import
dom
=
require
(
'
vs/base/browser/dom
'
);
import
objects
=
require
(
'
vs/base/common/objects
'
);
...
...
@@ -110,7 +106,7 @@ class DecorationRenderOptions implements IModelDecorationOptions {
color
:
themedOpts
.
light
.
overviewRulerColor
||
themedOpts
.
dark
.
overviewRulerColor
,
darkColor
:
themedOpts
.
dark
.
overviewRulerColor
||
themedOpts
.
light
.
overviewRulerColor
,
position
:
options
.
overviewRulerLane
||
OverviewRulerLane
.
Center
}
}
;
}
}
...
...
src/vs/editor/browser/standalone/simpleServices.ts
浏览文件 @
42451b5f
...
...
@@ -7,7 +7,6 @@
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
Errors
=
require
(
'
vs/base/common/errors
'
);
import
Network
=
require
(
'
vs/base/common/network
'
);
import
URI
from
'
vs/base/common/uri
'
;
import
EventEmitter
=
require
(
'
vs/base/common/eventEmitter
'
);
import
EditorBrowser
=
require
(
'
vs/editor/browser/editorBrowser
'
);
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
...
...
@@ -19,11 +18,10 @@ import {IEditorInput, IEditorService, IEditorOptions, Position, IEditor, IResour
import
{
IMessageService
,
IConfirmation
}
from
'
vs/platform/message/common/message
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IKeybinding
ContextKey
,
IKeybinding
Item
,
ICommandHandler
,
ICommandsMap
}
from
'
vs/platform/keybinding/common/keybindingService
'
;
import
{
IKeybindingItem
,
ICommandHandler
,
ICommandsMap
}
from
'
vs/platform/keybinding/common/keybindingService
'
;
import
{
AbstractPluginService
,
ActivatedPlugin
}
from
'
vs/platform/plugins/common/abstractPluginService
'
;
import
{
IOSupport
}
from
'
vs/platform/keybinding/common/keybindingResolver
'
;
import
{
IPluginDescription
}
from
'
vs/platform/plugins/common/plugins
'
;
import
{
PluginsRegistry
,
PluginsMessageCollector
}
from
'
vs/platform/plugins/common/pluginsRegistry
'
;
export
class
SimpleEditor
implements
IEditor
{
...
...
@@ -123,7 +121,7 @@ export class SimpleEditorService implements IEditorService {
if
(
selection
)
{
if
(
typeof
selection
.
endLineNumber
===
'
number
'
&&
typeof
selection
.
endColumn
===
'
number
'
)
{
editor
.
setSelection
(
selection
);
editor
.
revealRangeInCenter
(
selection
)
editor
.
revealRangeInCenter
(
selection
)
;
}
else
{
var
pos
=
{
lineNumber
:
selection
.
startLineNumber
,
...
...
src/vs/editor/browser/standalone/standaloneCodeEditor.ts
浏览文件 @
42451b5f
...
...
@@ -12,17 +12,13 @@ import EditorBrowser = require('vs/editor/browser/editorBrowser');
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Modes
=
require
(
'
vs/editor/common/modes
'
);
import
standaloneServices
=
require
(
'
vs/editor/browser/standalone/standaloneServices
'
);
import
Platform
=
require
(
'
vs/platform/platform
'
);
import
URI
from
'
vs/base/common/uri
'
;
import
Model
=
require
(
'
vs/editor/common/model/model
'
);
import
Lifecycle
=
require
(
'
vs/base/common/lifecycle
'
);
import
MonarchTypes
=
require
(
'
vs/editor/common/modes/monarch/monarchTypes
'
);
import
InstantiationService
=
require
(
'
vs/platform/instantiation/common/instantiationService
'
);
import
DiffEditorWidget
=
require
(
'
vs/editor/browser/widget/diffEditorWidget
'
);
import
{
DefaultConfig
}
from
'
vs/editor/common/config/defaultConfig
'
;
import
{
IPluginDescription
}
from
'
vs/platform/plugins/common/plugins
'
;
import
{
PluginsRegistry
}
from
'
vs/platform/plugins/common/pluginsRegistry
'
;
import
monarch
=
require
(
'
vs/editor/common/modes/monarch/monarch
'
);
import
vscode
=
require
(
'
vscode
'
);
import
{
RemoteTelemetryServiceHelper
}
from
'
vs/platform/telemetry/common/abstractRemoteTelemetryService
'
;
import
{
IEditorService
}
from
'
vs/platform/editor/common/editor
'
;
...
...
src/vs/editor/browser/standalone/standaloneEditor.ts
浏览文件 @
42451b5f
...
...
@@ -75,4 +75,4 @@ MonacoEditorLanguages.forEach((language) => {
let
MonacoEditorSchemas
:
{
[
url
:
string
]:
IJSONSchema
}
=
this
.
MonacoEditorSchemas
||
{};
for
(
var
uri
in
MonacoEditorSchemas
)
{
standaloneCodeEditor
.
registerStandaloneSchema
(
uri
,
MonacoEditorSchemas
[
uri
]);
};
\ No newline at end of file
}
src/vs/editor/browser/standalone/standaloneServices.ts
浏览文件 @
42451b5f
...
...
@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
{
ModelServiceImpl
}
from
'
vs/editor/common/services/modelServiceImpl
'
;
import
InstantiationService
=
require
(
'
vs/platform/instantiation/common/instantiationService
'
);
import
mainThreadService
=
require
(
'
vs/platform/thread/common/mainThreadService
'
);
...
...
@@ -38,7 +37,6 @@ import {IThreadService} from 'vs/platform/thread/common/thread';
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybindingService
'
;
import
{
IPluginService
}
from
'
vs/platform/plugins/common/plugins
'
;
import
{
AbstractPluginService
}
from
'
vs/platform/plugins/common/abstractPluginService
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
import
{
MainThreadModeServiceImpl
}
from
'
vs/editor/common/services/modeServiceImpl
'
;
...
...
src/vs/editor/browser/view/viewImpl.ts
浏览文件 @
42451b5f
...
...
@@ -397,7 +397,6 @@ export class View extends ViewEventHandler implements EditorBrowser.IView, Lifec
}
this
.
_flushAccumulatedAndRenderNow
();
var
linesViewPortData
=
this
.
layoutProvider
.
getLinesViewportData
();
var
correctionTop
=
0
;
var
visibleRanges
=
this
.
viewLines
.
visibleRangesForRange2
(
new
Range
(
lineNumber
,
column
,
lineNumber
,
column
),
linesViewPortData
.
visibleRangesDeltaTop
);
if
(
!
visibleRanges
)
{
return
null
;
...
...
src/vs/editor/browser/view/viewLayer.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
DomUtils
=
require
(
'
vs/base/browser/dom
'
);
import
Timer
=
require
(
'
vs/base/common/timer
'
);
import
{
ViewPart
}
from
'
vs/editor/browser/view/viewPart
'
;
import
EditorBrowser
=
require
(
'
vs/editor/browser/editorBrowser
'
);
...
...
src/vs/editor/browser/view/viewOverlays.ts
浏览文件 @
42451b5f
...
...
@@ -6,7 +6,6 @@
import
Browser
=
require
(
'
vs/base/browser/browser
'
);
import
DomUtils
=
require
(
'
vs/base/browser/dom
'
);
import
Lifecycle
=
require
(
'
vs/base/common/lifecycle
'
);
import
{
ViewLayer
,
IVisibleLineData
}
from
'
vs/editor/browser/view/viewLayer
'
;
import
EditorBrowser
=
require
(
'
vs/editor/browser/editorBrowser
'
);
...
...
src/vs/editor/browser/viewLayout/layoutProvider.ts
浏览文件 @
42451b5f
...
...
@@ -6,7 +6,6 @@
import
Lifecycle
=
require
(
'
vs/base/common/lifecycle
'
);
import
Objects
=
require
(
'
vs/base/common/objects
'
);
import
{
LinesLayout
}
from
'
vs/editor/common/viewLayout/linesLayout
'
;
import
{
ViewEventHandler
}
from
'
vs/editor/common/viewModel/viewEventHandler
'
;
import
{
ScrollManager
}
from
'
vs/editor/browser/viewLayout/scrollManager
'
;
...
...
@@ -83,7 +82,6 @@ export class LayoutProvider extends ViewEventHandler implements Lifecycle.IDispo
public
onConfigurationChanged
(
e
:
EditorCommon
.
IConfigurationChangedEvent
):
boolean
{
if
(
e
.
layoutInfo
)
{
var
layoutInfo
=
this
.
configuration
.
editor
.
layoutInfo
;
this
.
scrollable
.
setWidth
(
this
.
configuration
.
editor
.
layoutInfo
.
contentWidth
);
this
.
scrollable
.
setHeight
(
this
.
configuration
.
editor
.
layoutInfo
.
contentHeight
);
this
.
scrollManager
.
onSizeProviderLayoutChanged
();
...
...
src/vs/editor/browser/viewLayout/scrollManager.ts
浏览文件 @
42451b5f
...
...
@@ -8,7 +8,6 @@ import ScrollableElement = require('vs/base/browser/ui/scrollbar/scrollableEleme
import
ScrollableElementImpl
=
require
(
'
vs/base/browser/ui/scrollbar/scrollableElementImpl
'
);
import
DomUtils
=
require
(
'
vs/base/browser/dom
'
);
import
Lifecycle
=
require
(
'
vs/base/common/lifecycle
'
);
import
Objects
=
require
(
'
vs/base/common/objects
'
);
import
{
EditorScrollable
}
from
'
vs/editor/common/viewLayout/editorScrollable
'
;
import
EditorBrowser
=
require
(
'
vs/editor/browser/editorBrowser
'
);
...
...
src/vs/editor/browser/widget/codeEditorWidget.ts
浏览文件 @
42451b5f
...
...
@@ -11,7 +11,6 @@ import 'vs/css!./media/default-theme';
import
*
as
EditorCommon
from
'
vs/editor/common/editorCommon
'
;
import
*
as
Browser
from
'
vs/base/browser/browser
'
;
import
{
colorizeLine
}
from
'
vs/editor/browser/standalone/colorizer
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
{
IEventEmitter
}
from
'
vs/base/common/eventEmitter
'
;
...
...
@@ -22,7 +21,6 @@ import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions';
import
{
CommonEditorRegistry
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/common/services/codeEditorService
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
...
src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Strings
=
require
(
'
vs/base/common/strings
'
);
...
...
src/vs/editor/common/commonCodeEditor.ts
浏览文件 @
42451b5f
...
...
@@ -15,7 +15,6 @@ import {CharacterHardWrappingLineMapperFactory} from 'vs/editor/common/viewModel
import
{
SplitLinesCollection
}
from
'
vs/editor/common/viewModel/splitLinesCollection
'
;
import
{
ViewModel
}
from
'
vs/editor/common/viewModel/viewModel
'
;
import
*
as
Timer
from
'
vs/base/common/timer
'
;
import
{
CommonEditorRegistry
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
IActionProvider
,
IAction
,
isAction
}
from
'
vs/base/common/actions
'
;
import
{
CursorMoveHelper
}
from
'
vs/editor/common/controller/cursorMoveHelper
'
;
import
{
IViewModelHelper
}
from
'
vs/editor/common/controller/oneCursor
'
;
...
...
src/vs/editor/common/controller/oneCursor.ts
浏览文件 @
42451b5f
...
...
@@ -11,7 +11,7 @@ import {ShiftCommand} from 'vs/editor/common/commands/shiftCommand';
import
{
ReplaceCommand
,
ReplaceCommandWithOffsetCursorState
,
ReplaceCommandWithoutChangingPosition
}
from
'
vs/editor/common/commands/replaceCommand
'
;
import
{
SurroundSelectionCommand
}
from
'
vs/editor/common/commands/surroundSelectionCommand
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
I
EnterAction
,
I
ndentAction
,
IElectricAction
}
from
'
vs/editor/common/modes
'
;
import
{
IndentAction
,
IElectricAction
}
from
'
vs/editor/common/modes
'
;
import
{
CursorMoveHelper
,
ICursorMoveHelperModel
,
IMoveResult
}
from
'
vs/editor/common/controller/cursorMoveHelper
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Errors
=
require
(
'
vs/base/common/errors
'
);
...
...
@@ -161,7 +161,7 @@ export class OneCursor {
viewPosition
:
this
.
viewPosition
,
leftoverVisibleColumns
:
this
.
leftoverVisibleColumns
,
selectionStartLeftoverVisibleColumns
:
this
.
selectionStartLeftoverVisibleColumns
}
}
;
}
public
restoreState
(
state
:
IOneCursorState
):
void
{
...
...
@@ -598,7 +598,7 @@ export class OneCursorOp {
viewLineNumber
=
viewSelectionEnd
.
lineNumber
;
viewColumn
=
viewSelectionEnd
.
column
;
}
else
{
var
validatedViewPosition
=
cursor
.
getValidViewPosition
();
;
var
validatedViewPosition
=
cursor
.
getValidViewPosition
();
var
r
=
cursor
.
getRightOfViewPosition
(
validatedViewPosition
.
lineNumber
,
validatedViewPosition
.
column
);
viewLineNumber
=
r
.
lineNumber
;
viewColumn
=
r
.
column
;
...
...
@@ -649,7 +649,7 @@ export class OneCursorOp {
viewLineNumber
=
viewSelectionEnd
.
lineNumber
;
viewColumn
=
viewSelectionEnd
.
column
;
}
else
{
var
validatedViewPosition
=
cursor
.
getValidViewPosition
();
;
var
validatedViewPosition
=
cursor
.
getValidViewPosition
();
viewLineNumber
=
validatedViewPosition
.
lineNumber
;
viewColumn
=
validatedViewPosition
.
column
;
}
...
...
src/vs/editor/common/controller/textAreaState.ts
浏览文件 @
42451b5f
...
...
@@ -291,7 +291,7 @@ export class IENarratorTextAreaState extends TextAreaState {
}
public
fromText
(
text
:
string
):
TextAreaState
{
return
new
IENarratorTextAreaState
(
this
,
text
,
0
,
text
.
length
,
false
,
0
)
return
new
IENarratorTextAreaState
(
this
,
text
,
0
,
text
.
length
,
false
,
0
)
;
}
public
resetSelection
():
TextAreaState
{
...
...
@@ -352,7 +352,7 @@ export class NVDATextAreaState extends TextAreaState {
}
public
fromText
(
text
:
string
):
TextAreaState
{
return
new
NVDATextAreaState
(
this
,
text
,
0
,
text
.
length
,
false
)
return
new
NVDATextAreaState
(
this
,
text
,
0
,
text
.
length
,
false
)
;
}
public
resetSelection
():
TextAreaState
{
...
...
src/vs/editor/common/editorCommon.ts
浏览文件 @
42451b5f
...
...
@@ -7,7 +7,7 @@
import
{
IEventEmitter
,
ListenerUnbind
}
from
'
vs/base/common/eventEmitter
'
;
import
Modes
=
require
(
'
vs/editor/common/modes
'
);
import
TokensBinaryEncoding
=
require
(
'
vs/editor/common/model/tokensBinaryEncoding
'
);
import
{
IInstantiationService
,
INewConstructorSignature1
,
I
ConstructorSignature2
,
I
NewConstructorSignature2
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IInstantiationService
,
INewConstructorSignature1
,
INewConstructorSignature2
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
IHTMLContentElement
}
from
'
vs/base/common/htmlContent
'
;
import
URI
from
'
vs/base/common/uri
'
;
...
...
@@ -1987,7 +1987,7 @@ export interface IModelPropertiesChangedEvent {
/**
* Decoration data associated with a model decorations changed event.
*/
export
interface
IModelDecorationsChangedEvent
_
DecorationData
{
export
interface
IModelDecorationsChangedEventDecorationData
{
id
:
string
;
ownerId
:
number
;
range
:
IRange
;
...
...
@@ -2005,7 +2005,7 @@ export interface IModelDecorationsChangedEvent {
/**
* Lists of details
*/
addedOrChangedDecorations
:
IModelDecorationsChangedEvent
_
DecorationData
[];
addedOrChangedDecorations
:
IModelDecorationsChangedEventDecorationData
[];
removedDecorations
:
string
[];
oldOptions
:{[
decorationId
:
string
]:
IModelDecorationOptions
;};
oldRanges
:{[
decorationId
:
string
]:
IRange
;};
...
...
src/vs/editor/common/model/editStack.ts
浏览文件 @
42451b5f
...
...
@@ -4,7 +4,6 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Errors
=
require
(
'
vs/base/common/errors
'
);
...
...
src/vs/editor/common/model/editableTextModel.ts
浏览文件 @
42451b5f
...
...
@@ -5,14 +5,12 @@
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
EditStack
}
from
'
vs/editor/common/model/editStack
'
;
import
{
IChangedMarkers
,
ITextWithMarkers
,
ModelLine
,
ILineEdit
,
ILineMarker
}
from
'
vs/editor/common/model/modelLine
'
;
import
{
ModelLine
,
ILineEdit
,
ILineMarker
}
from
'
vs/editor/common/model/modelLine
'
;
import
{
TextModelWithDecorations
,
DeferredEventsBuilder
}
from
'
vs/editor/common/model/textModelWithDecorations
'
;
import
{
IMode
}
from
'
vs/editor/common/modes
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Errors
=
require
(
'
vs/base/common/errors
'
);
export
interface
IDeltaSingleEditOperation
{
original
:
IValidatedEditOperation
;
...
...
@@ -607,7 +605,7 @@ export class EditableTextModel extends TextModelWithDecorations implements Edito
versionId
:
-
1
,
isUndoing
:
this
.
_isUndoing
,
isRedoing
:
this
.
_isRedoing
}
}
;
}
private
_createLinesDeletedEvent
(
fromLineNumber
:
number
,
toLineNumber
:
number
):
EditorCommon
.
IModelContentChangedLinesDeletedEvent
{
...
...
src/vs/editor/common/model/mirrorModel.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IEventEmitter
}
from
'
vs/base/common/eventEmitter
'
;
import
{
PrefixSumComputer
,
IPrefixSumIndexOfResult
}
from
'
vs/editor/common/viewModel/prefixSumComputer
'
;
import
{
IMode
}
from
'
vs/editor/common/modes
'
;
import
{
TextModel
}
from
'
vs/editor/common/model/textModel
'
;
...
...
@@ -231,18 +230,6 @@ export class AbstractMirrorModel extends TextModelWithTokens implements EditorCo
}
return
result
;
}
private
getWord
(
content
:
string
,
position
:
number
,
callback
:(
text
:
string
,
start
:
number
,
end
:
number
)
=>
any
):
any
{
var
words
=
this
.
wordenize
(
content
);
for
(
var
i
=
0
;
i
<
words
.
length
&&
position
>=
words
[
i
].
start
;
i
++
)
{
var
word
=
words
[
i
];
if
(
position
<=
word
.
end
)
{
return
callback
(
content
,
word
.
start
,
word
.
end
);
}
}
return
callback
(
content
,
-
1
,
-
1
);
}
}
export
class
MirrorModelEmbedded
extends
AbstractMirrorModel
implements
EditorCommon
.
IMirrorModel
{
...
...
@@ -546,7 +533,6 @@ export class MirrorModel extends AbstractMirrorModel implements EditorCommon.IMi
private
_onLinesInserted
(
e
:
EditorCommon
.
IModelContentChangedLinesInsertedEvent
)
:
void
{
var
lineIndex
:
number
,
i
:
number
,
eolLength
=
this
.
getEOL
().
length
,
splitLines
=
e
.
detail
.
split
(
'
\n
'
);
for
(
lineIndex
=
e
.
fromLineNumber
-
1
,
i
=
0
;
lineIndex
<
e
.
toLineNumber
;
lineIndex
++
,
i
++
)
{
...
...
src/vs/editor/common/model/model.ts
浏览文件 @
42451b5f
...
...
@@ -11,7 +11,6 @@ import {EditableTextModel} from 'vs/editor/common/model/editableTextModel';
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
URI
from
'
vs/base/common/uri
'
;
import
Objects
=
require
(
'
vs/base/common/objects
'
);
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
// The hierarchy is:
// Model -> EditableTextModel -> TextModelWithDecorations -> TextModelWithTrackedRanges -> TextModelWithMarkers -> TextModelWithTokens -> TextModel
...
...
src/vs/editor/common/model/textModel.ts
浏览文件 @
42451b5f
...
...
@@ -11,7 +11,6 @@ import {Range} from 'vs/editor/common/core/range';
import
{
ModelLine
}
from
'
vs/editor/common/model/modelLine
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Platform
=
require
(
'
vs/base/common/platform
'
);
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
var
__space
=
'
'
.
charCodeAt
(
0
);
var
__tab
=
'
\t
'
.
charCodeAt
(
0
);
...
...
@@ -19,10 +18,6 @@ var LIMIT_FIND_COUNT = 999;
var
DEFAULT_PLATFORM_EOL
=
(
Platform
.
isLinux
||
Platform
.
isMacintosh
)
?
'
\n
'
:
'
\r\n
'
;
export
interface
IIndentationFactors
{
/**
* number of lines with indentation
*/
linesWithIndentationCount
:
number
;
/**
* The number of lines that are indented with tabs
*/
...
...
@@ -328,10 +323,6 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
charCode
:
number
,
prevLineCharCode
:
number
,
lines
=
this
.
_lines
,
/**
* number of lines with indentation
*/
linesWithIndentationCount
=
0
,
/**
* text on current line
*/
...
...
@@ -395,7 +386,6 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
}
if
(
currentLineHasContent
&&
(
tmpTabCounts
>
0
||
tmpSpaceCounts
>
0
))
{
linesWithIndentationCount
++
;
if
(
tmpTabCounts
>
0
)
{
linesIndentedWithTabs
++
;
}
...
...
@@ -461,7 +451,6 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
}
return
{
linesWithIndentationCount
:
linesWithIndentationCount
,
linesIndentedWithTabs
:
linesIndentedWithTabs
,
relativeSpaceCounts
:
relativeSpaceCounts
,
absoluteSpaceCounts
:
absoluteSpaceCounts
...
...
@@ -476,7 +465,6 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
let
i
:
number
,
len
:
number
,
factors
=
this
.
_extractIndentationFactors
(),
linesWithIndentationCount
=
factors
.
linesWithIndentationCount
,
linesIndentedWithTabs
=
factors
.
linesIndentedWithTabs
,
absoluteSpaceCounts
=
factors
.
absoluteSpaceCounts
,
relativeSpaceCounts
=
factors
.
relativeSpaceCounts
;
...
...
@@ -513,7 +501,6 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
}
// console.log('----------');
// console.log('linesWithIndentationCount: ', linesWithIndentationCount);
// console.log('linesIndentedWithTabs: ', linesIndentedWithTabs);
// console.log('absoluteSpaceCounts: ', absoluteSpaceCounts);
// console.log('relativeSpaceCounts: ', relativeSpaceCounts);
...
...
src/vs/editor/common/model/textModelWithDecorations.ts
浏览文件 @
42451b5f
...
...
@@ -384,10 +384,10 @@ export class TextModelWithDecorations extends TextModelWithTrackedRanges impleme
private
_handleCollectedDecorationsEvents
(
b
:
DeferredEventsBuilder
):
void
{
var
decorationId
:
string
,
addedOrChangedDecorations
:
EditorCommon
.
IModelDecorationsChangedEvent
_
DecorationData
[]
=
[],
addedOrChangedDecorations
:
EditorCommon
.
IModelDecorationsChangedEventDecorationData
[]
=
[],
removedDecorations
:
string
[]
=
[],
decorationIds
:
string
[]
=
[],
decorationData
:
EditorCommon
.
IModelDecorationsChangedEvent
_
DecorationData
,
decorationData
:
EditorCommon
.
IModelDecorationsChangedEventDecorationData
,
oldRange
:
EditorCommon
.
IRange
;
for
(
decorationId
in
b
.
newOrChangedDecorations
)
{
...
...
@@ -425,7 +425,7 @@ export class TextModelWithDecorations extends TextModelWithTrackedRanges impleme
}
}
private
_getDecorationData
(
decorationId
:
string
):
EditorCommon
.
IModelDecorationsChangedEvent
_
DecorationData
{
private
_getDecorationData
(
decorationId
:
string
):
EditorCommon
.
IModelDecorationsChangedEventDecorationData
{
var
decoration
=
this
.
decorations
[
decorationId
];
return
{
id
:
decoration
.
id
,
...
...
@@ -446,7 +446,7 @@ export class TextModelWithDecorations extends TextModelWithTrackedRanges impleme
let
result
:
ModelDeltaDecoration
[]
=
[];
for
(
let
i
=
0
,
len
=
deltaDecorations
.
length
;
i
<
len
;
i
++
)
{
let
deltaDecoration
=
deltaDecorations
[
i
];
result
.
push
(
new
ModelDeltaDecoration
(
i
,
this
.
validateRange
(
deltaDecoration
.
range
),
_normalizeOptions
(
deltaDecoration
.
options
)))
result
.
push
(
new
ModelDeltaDecoration
(
i
,
this
.
validateRange
(
deltaDecoration
.
range
),
_normalizeOptions
(
deltaDecoration
.
options
)))
;
}
return
result
;
}
...
...
src/vs/editor/common/modes.ts
浏览文件 @
42451b5f
...
...
@@ -6,7 +6,7 @@
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IMatch
}
from
'
vs/base/common/filters
'
;
import
{
IMarker
,
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IMarker
}
from
'
vs/platform/markers/common/markers
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
{
IHTMLContentElement
}
from
'
vs/base/common/htmlContent
'
;
import
URI
from
'
vs/base/common/uri
'
;
...
...
src/vs/editor/common/modes/TMState.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
{
AbstractState
}
from
'
vs/editor/common/modes/abstractState
'
;
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
Modes
=
require
(
'
vs/editor/common/modes
'
);
import
{
StackElement
}
from
'
vscode-textmate
'
;
...
...
src/vs/editor/common/modes/abstractMode.ts
浏览文件 @
42451b5f
...
...
@@ -17,7 +17,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IThreadService
,
ThreadAffinity
}
from
'
vs/platform/thread/common/thread
'
;
import
{
OneWorkerAttr
,
AllWorkersAttr
}
from
'
vs/platform/thread/common/threadService
'
;
import
{
AsyncDescriptor
0
,
AsyncDescriptor
2
,
createAsyncDescriptor2
}
from
'
vs/platform/instantiation/common/descriptors
'
;
import
{
AsyncDescriptor2
,
createAsyncDescriptor2
}
from
'
vs/platform/instantiation/common/descriptors
'
;
export
function
createWordRegExp
(
allowInWords
:
string
=
''
):
RegExp
{
return
NullMode
.
createWordRegExp
(
allowInWords
);
...
...
@@ -264,7 +264,7 @@ class SimplifiedMode implements Modes.IMode {
let
newEvent
=
SimplifiedMode
.
_createModeSupportChangedEvent
(
e
);
this
.
_eventEmitter
.
emit
(
'
modeSupportChanged
'
,
newEvent
);
}
})
})
;
}
}
...
...
src/vs/editor/common/modes/abstractModeWorker.ts
浏览文件 @
42451b5f
...
...
@@ -4,13 +4,12 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
IEventEmitter
}
from
'
vs/base/common/eventEmitter
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IMarkerService
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IResourceService
}
from
'
vs/editor/common/services/resourceService
'
;
import
{
computeLinks
}
from
'
vs/editor/common/modes/linkComputer
'
;
import
{
DiffComputer
}
from
'
vs/editor/common/diff/diffComputer
'
;
import
{
DefaultFilter
,
and
}
from
'
vs/editor/common/modes/modesFilters
'
;
import
{
DefaultFilter
}
from
'
vs/editor/common/modes/modesFilters
'
;
import
{
TextModel
}
from
'
vs/editor/common/model/textModel
'
;
import
{
WorkerInplaceReplaceSupport
}
from
'
vs/editor/common/modes/supports
'
;
import
{
ValidationHelper
}
from
'
vs/editor/common/worker/validationHelper
'
;
...
...
src/vs/editor/common/modes/autoIndentation.ts
浏览文件 @
42451b5f
...
...
@@ -76,7 +76,7 @@ export class Brackets {
// Filter duplicate entries
result
=
result
.
filter
((
item
,
pos
,
array
)
=>
{
return
array
.
indexOf
(
item
)
==
pos
;
return
array
.
indexOf
(
item
)
==
=
pos
;
});
return
result
;
...
...
src/vs/editor/common/modes/languageExtensionPoint.ts
浏览文件 @
42451b5f
...
...
@@ -10,11 +10,9 @@ import paths = require('vs/base/common/paths');
import
Strings
=
require
(
'
vs/base/common/strings
'
);
import
{
IThreadSynchronizableObject
}
from
'
vs/platform/thread/common/thread
'
;
import
{
EverywhereAttr
,
registerThreadSynchronizableObject
}
from
'
vs/platform/thread/common/threadService
'
;
import
{
IPluginDescription
}
from
'
vs/platform/plugins/common/plugins
'
;
import
{
PluginsRegistry
,
IExtensionPointUser
,
IMessageCollector
}
from
'
vs/platform/plugins/common/pluginsRegistry
'
;
import
Mime
=
require
(
'
vs/base/common/mime
'
);
import
Errors
=
require
(
'
vs/base/common/errors
'
);
import
{
IMode
,
IModeDescriptor
}
from
'
vs/editor/common/modes
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
interface
ILanguagePointData
{
...
...
@@ -306,13 +304,6 @@ class LanguageExtensionPointHandler implements IThreadSynchronizableObject<ILang
}
}
private
_setMime2LanguageId
(
mimeType
:
string
,
modeId
:
string
):
void
{
if
(
this
.
mime2LanguageId
[
mimeType
]
&&
this
.
mime2LanguageId
[
mimeType
]
!==
modeId
)
{
console
.
warn
(
'
Overwriting mime <<
'
+
mimeType
+
'
>> to now point to modeId <<
'
+
modeId
+
'
>>
'
);
}
this
.
mime2LanguageId
[
mimeType
]
=
modeId
;
}
public
registerLanguage
(
lang
:
ILanguageExtensionPoint
):
void
{
this
.
_onLanguage
(
lang
);
}
...
...
src/vs/editor/common/modes/languageFeatureRegistry.ts
浏览文件 @
42451b5f
...
...
@@ -58,7 +58,7 @@ export default class LanguageFeatureRegistry<T> {
}
}
}
}
}
;
}
has
(
model
:
IModel
):
boolean
{
...
...
src/vs/editor/common/modes/modesRegistry.ts
浏览文件 @
42451b5f
...
...
@@ -4,14 +4,11 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
LanguageExtensions
,
ILegacyLanguageDefinition
}
from
'
vs/editor/common/modes/languageExtensionPoint
'
;
import
Modes
=
require
(
'
vs/editor/common/modes
'
);
import
Strings
=
require
(
'
vs/base/common/strings
'
);
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
IPluginDescription
}
from
'
vs/platform/plugins/common/plugins
'
;
import
{
PluginsRegistry
}
from
'
vs/platform/plugins/common/pluginsRegistry
'
;
// Define extension point ids
export
var
Extensions
=
{
...
...
@@ -158,7 +155,7 @@ export function getSnippets(model: EditorCommon.IModel, position: EditorCommon.I
var
result
:
Modes
.
ISuggestResult
=
{
currentWord
:
currentPrefix
,
suggestions
:
[]
}
}
;
// to avoid that snippets are too prominent in the intellisense proposals:
// - force that the current prefix matches with the snippet prefix
...
...
src/vs/editor/common/modes/nullMode.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
Modes
=
require
(
'
vs/editor/common/modes
'
);
import
EditorCommon
=
require
(
'
vs/editor/common/editorCommon
'
);
export
class
NullState
implements
Modes
.
IState
{
...
...
src/vs/editor/common/modes/supports.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,6 @@
'
use strict
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
Errors
=
require
(
'
vs/base/common/errors
'
);
import
Strings
=
require
(
'
vs/base/common/strings
'
);
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
LineStream
}
from
'
vs/editor/common/modes/lineStream
'
;
...
...
src/vs/editor/common/viewModel/viewModelDecorations.ts
浏览文件 @
42451b5f
...
...
@@ -101,8 +101,8 @@ export class ViewModelDecorations implements IDisposable {
// Interpret addedOrChangedDecorations
var
removedMap
:{[
id
:
string
]:
boolean
;}
=
{},
addedOrChangedMap
:{[
id
:
string
]:
EditorCommon
.
IModelDecorationsChangedEvent
_
DecorationData
;}
=
{},
theirDecoration
:
EditorCommon
.
IModelDecorationsChangedEvent
_
DecorationData
,
addedOrChangedMap
:{[
id
:
string
]:
EditorCommon
.
IModelDecorationsChangedEventDecorationData
;}
=
{},
theirDecoration
:
EditorCommon
.
IModelDecorationsChangedEventDecorationData
,
i
:
number
,
skipValidation
=
this
.
configuration
.
editor
.
readOnly
,
len
:
number
;
...
...
src/vs/editor/node/languageConfiguration.ts
浏览文件 @
42451b5f
...
...
@@ -5,7 +5,7 @@
'
use strict
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
import
{
ILanguageExtensionPoint
,
LanguageExtensions
}
from
'
vs/editor/common/modes/languageExtensionPoint
'
;
import
{
LanguageExtensions
}
from
'
vs/editor/common/modes/languageExtensionPoint
'
;
import
{
PluginsRegistry
}
from
'
vs/platform/plugins/common/pluginsRegistry
'
;
import
pfs
=
require
(
'
vs/base/node/pfs
'
);
import
Supports
=
require
(
'
vs/editor/common/modes/supports
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录