From 42451b5fcc762e1bea008b49cfa2d25c024a9208 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 5 Feb 2016 10:09:22 +0100 Subject: [PATCH] More tslint --- src/vs/base/common/diff/diff2.ts | 2 +- src/vs/base/common/worker/workerProtocol.ts | 1 - src/vs/base/test/browser/mockDom.ts | 1 - .../editor/browser/controller/keyboardHandler.ts | 8 +------- src/vs/editor/browser/controller/mouseHandler.ts | 1 - src/vs/editor/browser/editorBrowser.ts | 2 -- src/vs/editor/browser/editorBrowserExtensions.ts | 4 ---- .../browser/services/codeEditorServiceImpl.ts | 6 +----- src/vs/editor/browser/standalone/simpleServices.ts | 6 ++---- .../browser/standalone/standaloneCodeEditor.ts | 4 ---- .../editor/browser/standalone/standaloneEditor.ts | 2 +- .../browser/standalone/standaloneServices.ts | 2 -- src/vs/editor/browser/view/viewImpl.ts | 1 - src/vs/editor/browser/view/viewLayer.ts | 1 - src/vs/editor/browser/view/viewOverlays.ts | 1 - src/vs/editor/browser/viewLayout/layoutProvider.ts | 2 -- src/vs/editor/browser/viewLayout/scrollManager.ts | 1 - src/vs/editor/browser/widget/codeEditorWidget.ts | 2 -- .../commands/trimTrailingWhitespaceCommand.ts | 1 - src/vs/editor/common/commonCodeEditor.ts | 1 - src/vs/editor/common/controller/oneCursor.ts | 8 ++++---- src/vs/editor/common/controller/textAreaState.ts | 4 ++-- src/vs/editor/common/editorCommon.ts | 6 +++--- src/vs/editor/common/model/editStack.ts | 1 - src/vs/editor/common/model/editableTextModel.ts | 6 ++---- src/vs/editor/common/model/mirrorModel.ts | 14 -------------- src/vs/editor/common/model/model.ts | 1 - src/vs/editor/common/model/textModel.ts | 13 ------------- .../common/model/textModelWithDecorations.ts | 8 ++++---- src/vs/editor/common/modes.ts | 2 +- src/vs/editor/common/modes/TMState.ts | 1 - src/vs/editor/common/modes/abstractMode.ts | 4 ++-- src/vs/editor/common/modes/abstractModeWorker.ts | 3 +-- src/vs/editor/common/modes/autoIndentation.ts | 2 +- .../editor/common/modes/languageExtensionPoint.ts | 9 --------- .../editor/common/modes/languageFeatureRegistry.ts | 2 +- src/vs/editor/common/modes/modesRegistry.ts | 5 +---- src/vs/editor/common/modes/nullMode.ts | 1 - src/vs/editor/common/modes/supports.ts | 1 - .../common/viewModel/viewModelDecorations.ts | 4 ++-- src/vs/editor/node/languageConfiguration.ts | 2 +- 41 files changed, 31 insertions(+), 115 deletions(-) diff --git a/src/vs/base/common/diff/diff2.ts b/src/vs/base/common/diff/diff2.ts index beb6881c00c..8fddbbb62a9 100644 --- a/src/vs/base/common/diff/diff2.ts +++ b/src/vs/base/common/diff/diff2.ts @@ -139,7 +139,7 @@ export class LcsDiff2 { return this.ids_for_x[xIndex] === this.ids_for_y[yIndex]; } - private ComputeDiff(): IDiffChange[] { + public ComputeDiff(): IDiffChange[] { let xLength = this.x.getLength(); let yLength = this.y.getLength(); diff --git a/src/vs/base/common/worker/workerProtocol.ts b/src/vs/base/common/worker/workerProtocol.ts index 06d7d64b8d0..0c07ce34223 100644 --- a/src/vs/base/common/worker/workerProtocol.ts +++ b/src/vs/base/common/worker/workerProtocol.ts @@ -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'); /** diff --git a/src/vs/base/test/browser/mockDom.ts b/src/vs/base/test/browser/mockDom.ts index 2fbe3fe08fc..8359086d2ec 100644 --- a/src/vs/base/test/browser/mockDom.ts +++ b/src/vs/base/test/browser/mockDom.ts @@ -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; diff --git a/src/vs/editor/browser/controller/keyboardHandler.ts b/src/vs/editor/browser/controller/keyboardHandler.ts index 4f79abdccd6..2d8fea794de 100644 --- a/src/vs/editor/browser/controller/keyboardHandler.ts +++ b/src/vs/editor/browser/controller/keyboardHandler.ts @@ -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'; diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts index ef7add9788c..6055573f881 100644 --- a/src/vs/editor/browser/controller/mouseHandler.ts +++ b/src/vs/editor/browser/controller/mouseHandler.ts @@ -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'); diff --git a/src/vs/editor/browser/editorBrowser.ts b/src/vs/editor/browser/editorBrowser.ts index 4dc0ad3a724..0e4167f8a30 100644 --- a/src/vs/editor/browser/editorBrowser.ts +++ b/src/vs/editor/browser/editorBrowser.ts @@ -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'); diff --git a/src/vs/editor/browser/editorBrowserExtensions.ts b/src/vs/editor/browser/editorBrowserExtensions.ts index 2fadc5d7116..5e48537057e 100644 --- a/src/vs/editor/browser/editorBrowserExtensions.ts +++ b/src/vs/editor/browser/editorBrowserExtensions.ts @@ -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 { diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts index d463034a61e..77b1cdfcda0 100644 --- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts +++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts @@ -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 - } + }; } } diff --git a/src/vs/editor/browser/standalone/simpleServices.ts b/src/vs/editor/browser/standalone/simpleServices.ts index a6e821f12fe..19125277662 100644 --- a/src/vs/editor/browser/standalone/simpleServices.ts +++ b/src/vs/editor/browser/standalone/simpleServices.ts @@ -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 {IKeybindingContextKey, IKeybindingItem, 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, diff --git a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts index bb19c960c66..9a7daa35159 100644 --- a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts +++ b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts @@ -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'; diff --git a/src/vs/editor/browser/standalone/standaloneEditor.ts b/src/vs/editor/browser/standalone/standaloneEditor.ts index ee5ffb40b37..329cec21083 100644 --- a/src/vs/editor/browser/standalone/standaloneEditor.ts +++ b/src/vs/editor/browser/standalone/standaloneEditor.ts @@ -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 +} diff --git a/src/vs/editor/browser/standalone/standaloneServices.ts b/src/vs/editor/browser/standalone/standaloneServices.ts index 8555a6dc590..3140b171759 100644 --- a/src/vs/editor/browser/standalone/standaloneServices.ts +++ b/src/vs/editor/browser/standalone/standaloneServices.ts @@ -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'; diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index 5497e3b9712..a0a42a58954 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/src/vs/editor/browser/view/viewImpl.ts @@ -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; diff --git a/src/vs/editor/browser/view/viewLayer.ts b/src/vs/editor/browser/view/viewLayer.ts index c5ac611a494..f1ff9d9a5d1 100644 --- a/src/vs/editor/browser/view/viewLayer.ts +++ b/src/vs/editor/browser/view/viewLayer.ts @@ -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'); diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts index a07acc0c0f3..5a94a8e0aa4 100644 --- a/src/vs/editor/browser/view/viewOverlays.ts +++ b/src/vs/editor/browser/view/viewOverlays.ts @@ -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'); diff --git a/src/vs/editor/browser/viewLayout/layoutProvider.ts b/src/vs/editor/browser/viewLayout/layoutProvider.ts index 6022641ec7a..586f6ac3fcd 100644 --- a/src/vs/editor/browser/viewLayout/layoutProvider.ts +++ b/src/vs/editor/browser/viewLayout/layoutProvider.ts @@ -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(); diff --git a/src/vs/editor/browser/viewLayout/scrollManager.ts b/src/vs/editor/browser/viewLayout/scrollManager.ts index 9680e02876b..db760a1f4e5 100644 --- a/src/vs/editor/browser/viewLayout/scrollManager.ts +++ b/src/vs/editor/browser/viewLayout/scrollManager.ts @@ -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'); diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts index a8f7c00357d..35826c8583e 100644 --- a/src/vs/editor/browser/widget/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditorWidget.ts @@ -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'; diff --git a/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts b/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts index 69c002e08e4..e41ba373f17 100644 --- a/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts +++ b/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts @@ -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'); diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts index 0c34c302ea5..a69be44199f 100644 --- a/src/vs/editor/common/commonCodeEditor.ts +++ b/src/vs/editor/common/commonCodeEditor.ts @@ -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'; diff --git a/src/vs/editor/common/controller/oneCursor.ts b/src/vs/editor/common/controller/oneCursor.ts index 08bfe1dc68f..44f0e4eb3c3 100644 --- a/src/vs/editor/common/controller/oneCursor.ts +++ b/src/vs/editor/common/controller/oneCursor.ts @@ -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 {IEnterAction,IndentAction,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; } diff --git a/src/vs/editor/common/controller/textAreaState.ts b/src/vs/editor/common/controller/textAreaState.ts index 808c6a4c2df..3916140d7ab 100644 --- a/src/vs/editor/common/controller/textAreaState.ts +++ b/src/vs/editor/common/controller/textAreaState.ts @@ -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 { diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index 54d77778f1c..d5a4d525f54 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -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, IConstructorSignature2, INewConstructorSignature2} 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;}; diff --git a/src/vs/editor/common/model/editStack.ts b/src/vs/editor/common/model/editStack.ts index babc2618f43..9170392f11d 100644 --- a/src/vs/editor/common/model/editStack.ts +++ b/src/vs/editor/common/model/editStack.ts @@ -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'); diff --git a/src/vs/editor/common/model/editableTextModel.ts b/src/vs/editor/common/model/editableTextModel.ts index b48778cfcf2..314245f9fef 100644 --- a/src/vs/editor/common/model/editableTextModel.ts +++ b/src/vs/editor/common/model/editableTextModel.ts @@ -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 { diff --git a/src/vs/editor/common/model/mirrorModel.ts b/src/vs/editor/common/model/mirrorModel.ts index a2d511ff675..3f01797a9e9 100644 --- a/src/vs/editor/common/model/mirrorModel.ts +++ b/src/vs/editor/common/model/mirrorModel.ts @@ -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++) { diff --git a/src/vs/editor/common/model/model.ts b/src/vs/editor/common/model/model.ts index 75152c30345..06311430847 100644 --- a/src/vs/editor/common/model/model.ts +++ b/src/vs/editor/common/model/model.ts @@ -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 diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 8f627eaeb11..6f332ea1640 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -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); diff --git a/src/vs/editor/common/model/textModelWithDecorations.ts b/src/vs/editor/common/model/textModelWithDecorations.ts index 1d0ad1872ca..f0f93838196 100644 --- a/src/vs/editor/common/model/textModelWithDecorations.ts +++ b/src/vs/editor/common/model/textModelWithDecorations.ts @@ -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; } diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 3ce5ed36842..7a7125a8eee 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -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'; diff --git a/src/vs/editor/common/modes/TMState.ts b/src/vs/editor/common/modes/TMState.ts index b1be0df9420..1216dc774c7 100644 --- a/src/vs/editor/common/modes/TMState.ts +++ b/src/vs/editor/common/modes/TMState.ts @@ -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'; diff --git a/src/vs/editor/common/modes/abstractMode.ts b/src/vs/editor/common/modes/abstractMode.ts index ae408097b42..eb2fa8c27af 100644 --- a/src/vs/editor/common/modes/abstractMode.ts +++ b/src/vs/editor/common/modes/abstractMode.ts @@ -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 {AsyncDescriptor0, AsyncDescriptor2, 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); } - }) + }); } } diff --git a/src/vs/editor/common/modes/abstractModeWorker.ts b/src/vs/editor/common/modes/abstractModeWorker.ts index 70cc19a98bf..2f62bd668d8 100644 --- a/src/vs/editor/common/modes/abstractModeWorker.ts +++ b/src/vs/editor/common/modes/abstractModeWorker.ts @@ -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'; diff --git a/src/vs/editor/common/modes/autoIndentation.ts b/src/vs/editor/common/modes/autoIndentation.ts index cb74dc839de..ad0ac92c626 100644 --- a/src/vs/editor/common/modes/autoIndentation.ts +++ b/src/vs/editor/common/modes/autoIndentation.ts @@ -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; diff --git a/src/vs/editor/common/modes/languageExtensionPoint.ts b/src/vs/editor/common/modes/languageExtensionPoint.ts index 6fabebf9d63..7ce5a787584 100644 --- a/src/vs/editor/common/modes/languageExtensionPoint.ts +++ b/src/vs/editor/common/modes/languageExtensionPoint.ts @@ -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> to now point to modeId <<' + modeId + '>>'); - } - this.mime2LanguageId[mimeType] = modeId; - } - public registerLanguage(lang: ILanguageExtensionPoint): void { this._onLanguage(lang); } diff --git a/src/vs/editor/common/modes/languageFeatureRegistry.ts b/src/vs/editor/common/modes/languageFeatureRegistry.ts index 3fb6b3cbe27..c4bdb1b2dcb 100644 --- a/src/vs/editor/common/modes/languageFeatureRegistry.ts +++ b/src/vs/editor/common/modes/languageFeatureRegistry.ts @@ -58,7 +58,7 @@ export default class LanguageFeatureRegistry { } } } - } + }; } has(model: IModel): boolean { diff --git a/src/vs/editor/common/modes/modesRegistry.ts b/src/vs/editor/common/modes/modesRegistry.ts index a9eed958df3..f39d57233d7 100644 --- a/src/vs/editor/common/modes/modesRegistry.ts +++ b/src/vs/editor/common/modes/modesRegistry.ts @@ -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 diff --git a/src/vs/editor/common/modes/nullMode.ts b/src/vs/editor/common/modes/nullMode.ts index 36e82233517..12e199ee5b3 100644 --- a/src/vs/editor/common/modes/nullMode.ts +++ b/src/vs/editor/common/modes/nullMode.ts @@ -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 { diff --git a/src/vs/editor/common/modes/supports.ts b/src/vs/editor/common/modes/supports.ts index f92966eacd1..03eb2368598 100644 --- a/src/vs/editor/common/modes/supports.ts +++ b/src/vs/editor/common/modes/supports.ts @@ -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'; diff --git a/src/vs/editor/common/viewModel/viewModelDecorations.ts b/src/vs/editor/common/viewModel/viewModelDecorations.ts index 052e2f60489..76e40b814c6 100644 --- a/src/vs/editor/common/viewModel/viewModelDecorations.ts +++ b/src/vs/editor/common/viewModel/viewModelDecorations.ts @@ -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; diff --git a/src/vs/editor/node/languageConfiguration.ts b/src/vs/editor/node/languageConfiguration.ts index e4d32c2adee..0ce88b2c185 100644 --- a/src/vs/editor/node/languageConfiguration.ts +++ b/src/vs/editor/node/languageConfiguration.ts @@ -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');