maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More tslint

Browse source
This commit is contained in:
Alex Dima 2016-02-05 10:09:22 +01:00
parent 9367be9a58
commit 42451b5fcc
41 changed files with 31 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/base/common/diff/diff2.ts
View file

@ -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();

1
src/vs/base/common/worker/workerProtocol.ts
View file

@ -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');
/**

1
src/vs/base/test/browser/mockDom.ts
View file

@ -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;

8
src/vs/editor/browser/controller/keyboardHandler.ts
View file

@ -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';

1
src/vs/editor/browser/controller/mouseHandler.ts
View file

@ -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');

2
src/vs/editor/browser/editorBrowser.ts
View file

@ -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');

4
src/vs/editor/browser/editorBrowserExtensions.ts
View file

@ -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 {

6
src/vs/editor/browser/services/codeEditorServiceImpl.ts
View file

@ -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
}
};
}
}

6
src/vs/editor/browser/standalone/simpleServices.ts
View file

@ -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,

4
src/vs/editor/browser/standalone/standaloneCodeEditor.ts
View file

@ -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';

2
src/vs/editor/browser/standalone/standaloneEditor.ts
View file

@ -75,4 +75,4 @@ MonacoEditorLanguages.forEach((language) => {
let MonacoEditorSchemas: { [url:string]: IJSONSchema } = this.MonacoEditorSchemas || {};
for (var uri in MonacoEditorSchemas) {
standaloneCodeEditor.registerStandaloneSchema(uri, MonacoEditorSchemas[uri]);
};
}

2
src/vs/editor/browser/standalone/standaloneServices.ts
View file

@ -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';

1
src/vs/editor/browser/view/viewImpl.ts
View file

@ -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;

1
src/vs/editor/browser/view/viewLayer.ts
View file

@ -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');

1
src/vs/editor/browser/view/viewOverlays.ts
View file

@ -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');

2
src/vs/editor/browser/viewLayout/layoutProvider.ts
View file

@ -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();

1
src/vs/editor/browser/viewLayout/scrollManager.ts
View file

@ -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');

2
src/vs/editor/browser/widget/codeEditorWidget.ts
View file

@ -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';

1
src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
View file

@ -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');

1
src/vs/editor/common/commonCodeEditor.ts
View file

@ -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';

8
src/vs/editor/common/controller/oneCursor.ts
View file

@ -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;
}

4
src/vs/editor/common/controller/textAreaState.ts
View file

@ -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 {

6
src/vs/editor/common/editorCommon.ts
View file

@ -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;};

1
src/vs/editor/common/model/editStack.ts
View file

@ -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');

6
src/vs/editor/common/model/editableTextModel.ts
View file

@ -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 {

14
src/vs/editor/common/model/mirrorModel.ts
View file

@ -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++) {

1
src/vs/editor/common/model/model.ts
View file

@ -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

13
src/vs/editor/common/model/textModel.ts
View file

@ -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);

8
src/vs/editor/common/model/textModelWithDecorations.ts
View file

@ -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;
}

2
src/vs/editor/common/modes.ts
View file

@ -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';

1
src/vs/editor/common/modes/TMState.ts
View file

@ -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';

4
src/vs/editor/common/modes/abstractMode.ts
View file

@ -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);
}
})
});
}
}

3
src/vs/editor/common/modes/abstractModeWorker.ts
View file

@ -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';

2
src/vs/editor/common/modes/autoIndentation.ts
View file

@ -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;

9
src/vs/editor/common/modes/languageExtensionPoint.ts
View file

@ -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);
}

2
src/vs/editor/common/modes/languageFeatureRegistry.ts
View file

@ -58,7 +58,7 @@ export default class LanguageFeatureRegistry<T> {
}
}
}
}
};
}
has(model: IModel): boolean {

5
src/vs/editor/common/modes/modesRegistry.ts
View file

@ -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

1
src/vs/editor/common/modes/nullMode.ts
View file

@ -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 {

1
src/vs/editor/common/modes/supports.ts
View file

@ -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';

4
src/vs/editor/common/viewModel/viewModelDecorations.ts
View file

@ -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;

2
src/vs/editor/node/languageConfiguration.ts
View file

@ -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');