Skip to content

Commit eac7644

Browse files
alexdimaalexdima
committed
Organize imports
1 parent 3d78927 commit eac7644

71 files changed

Lines changed: 744 additions & 760 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/editor/contrib/quickFix/browser/lightBulpWidget.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as dom from 'vs/base/browser/dom';
99
import {IPosition} from 'vs/editor/common/editorCommon';
1010
import {ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition} from 'vs/editor/browser/editorBrowser';
1111

12-
class LightBulpWidget implements IContentWidget, IDisposable {
12+
export class LightBulpWidget implements IContentWidget, IDisposable {
1313

1414
private editor: ICodeEditor;
1515
private position: IPosition;
@@ -70,4 +70,3 @@ class LightBulpWidget implements IContentWidget, IDisposable {
7070
}
7171
}
7272

73-
export = LightBulpWidget;

‎src/vs/editor/contrib/quickFix/browser/quickFixModel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {Range} from 'vs/editor/common/core/range';
1717
import {EventType, ICursorPositionChangedEvent, IModeSupportChangedEvent, IPosition, IRange} from 'vs/editor/common/editorCommon';
1818
import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
1919
import {IQuickFix2, QuickFixRegistry, getQuickFixes} from '../common/quickFix';
20-
import LightBulpWidget = require('./lightBulpWidget');
20+
import {LightBulpWidget} from './lightBulpWidget';
2121

2222
enum QuickFixSuggestState {
2323
NOT_ACTIVE = 0,

‎src/vs/editor/node/languageConfiguration.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
'use strict';
66

77
import * as nls from 'vs/nls';
8-
import {IModeService} from 'vs/editor/common/services/modeService';
8+
import {parse} from 'vs/base/common/json';
9+
import {readFile} from 'vs/base/node/pfs';
910
import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
10-
import pfs = require('vs/base/node/pfs');
11-
import json = require('vs/base/common/json');
1211
import {IRichEditConfiguration} from 'vs/editor/common/modes/supports/richEditSupport';
12+
import {IModeService} from 'vs/editor/common/services/modeService';
1313

1414
type CharacterPair = [string, string];
1515

@@ -51,9 +51,9 @@ export class LanguageConfigurationFileHandler {
5151
}
5252

5353
private _handleConfigFile(modeId:string, configFilePath:string): void {
54-
pfs.readFile(configFilePath).then((fileContents) => {
54+
readFile(configFilePath).then((fileContents) => {
5555
var errors = [];
56-
var configuration = <ILanguageConfiguration>json.parse(fileContents.toString(), errors);
56+
var configuration = <ILanguageConfiguration>parse(fileContents.toString(), errors);
5757
if (errors.length) {
5858
console.error(nls.localize('parseErrors', "Errors parsing {0}: {1}", configFilePath, errors.join('\n')));
5959
}

‎src/vs/editor/node/textMate/TMSyntax.ts‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@
55
'use strict';
66

77
import * as nls from 'vs/nls';
8-
9-
import paths = require('vs/base/common/paths');
10-
import errors = require('vs/base/common/errors');
11-
12-
import * as Modes from 'vs/editor/common/modes';
13-
import supports = require('vs/editor/common/modes/supports');
14-
import collections = require('vs/base/common/collections');
15-
import textMate = require('vscode-textmate');
16-
import TMState = require('vs/editor/common/modes/TMState');
8+
import * as collections from 'vs/base/common/collections';
9+
import {onUnexpectedError} from 'vs/base/common/errors';
10+
import * as paths from 'vs/base/common/paths';
11+
import {IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry';
12+
import {Bracket, ILineTokens, IMode, IToken, ITokenizationSupport} from 'vs/editor/common/modes';
13+
import {TMState} from 'vs/editor/common/modes/TMState';
14+
import {Token} from 'vs/editor/common/modes/supports';
1715
import {IModeService} from 'vs/editor/common/services/modeService';
18-
import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry';
16+
import {IGrammar, ITMToken, Registry} from 'vscode-textmate';
1917

2018
export interface ITMSyntaxExtensionPoint {
2119
language: string;
@@ -48,15 +46,15 @@ let grammarsExtPoint = PluginsRegistry.registerExtensionPoint<ITMSyntaxExtension
4846
});
4947

5048
export class MainProcessTextMateSyntax {
51-
private _grammarRegistry: textMate.Registry;
49+
private _grammarRegistry: Registry;
5250
private _modeService: IModeService;
5351
private _scopeNameToFilePath: { [scopeName:string]: string; };
5452

5553
constructor(
5654
@IModeService modeService: IModeService
5755
) {
5856
this._modeService = modeService;
59-
this._grammarRegistry = new textMate.Registry({
57+
this._grammarRegistry = new Registry({
6058
getFilePath: (scopeName:string) => {
6159
return this._scopeNameToFilePath[scopeName];
6260
}
@@ -105,44 +103,44 @@ export class MainProcessTextMateSyntax {
105103
public registerDefinition(modeId: string, scopeName: string): void {
106104
this._grammarRegistry.loadGrammar(scopeName, (err, grammar) => {
107105
if (err) {
108-
errors.onUnexpectedError(err);
106+
onUnexpectedError(err);
109107
return;
110108
}
111109

112-
this._modeService.registerTokenizationSupport(modeId, (mode: Modes.IMode) => {
110+
this._modeService.registerTokenizationSupport(modeId, (mode: IMode) => {
113111
return createTokenizationSupport(mode, grammar);
114112
});
115113
});
116114
}
117115
}
118116

119-
function createTokenizationSupport(mode: Modes.IMode, grammar: textMate.IGrammar): Modes.ITokenizationSupport {
117+
function createTokenizationSupport(mode: IMode, grammar: IGrammar): ITokenizationSupport {
120118
var tokenizer = new Tokenizer(mode.getId(), grammar);
121119
return {
122120
shouldGenerateEmbeddedModels: false,
123-
getInitialState: () => new TMState.TMState(mode, null, null),
124-
tokenize: (line, state, offsetDelta?, stopAtOffset?) => tokenizer.tokenize(line, <TMState.TMState> state, offsetDelta, stopAtOffset)
121+
getInitialState: () => new TMState(mode, null, null),
122+
tokenize: (line, state, offsetDelta?, stopAtOffset?) => tokenizer.tokenize(line, <TMState> state, offsetDelta, stopAtOffset)
125123
};
126124
}
127125

128126

129127

130128
class Tokenizer {
131-
private _grammar: textMate.IGrammar;
129+
private _grammar: IGrammar;
132130
private _modeId: string;
133131

134-
constructor(modeId:string, grammar: textMate.IGrammar) {
132+
constructor(modeId:string, grammar: IGrammar) {
135133
this._modeId = modeId;
136134
this._grammar = grammar;
137135
}
138136

139-
public tokenize(line: string, state: TMState.TMState, offsetDelta: number = 0, stopAtOffset?: number): Modes.ILineTokens {
137+
public tokenize(line: string, state: TMState, offsetDelta: number = 0, stopAtOffset?: number): ILineTokens {
140138
if (line.length >= 20000) {
141139
return {
142-
tokens: <Modes.IToken[]>[{
140+
tokens: <IToken[]>[{
143141
startIndex: offsetDelta,
144142
type: '',
145-
bracket: Modes.Bracket.None
143+
bracket: Bracket.None
146144
}],
147145
actualStopOffset: offsetDelta,
148146
endState: state,
@@ -155,7 +153,7 @@ class Tokenizer {
155153

156154
// Create the result early and fill in the tokens later
157155
let ret = {
158-
tokens: <Modes.IToken[]>[],
156+
tokens: <IToken[]>[],
159157
actualStopOffset: offsetDelta + line.length,
160158
endState: freshState,
161159
modeTransitions: [{ startIndex: offsetDelta, mode: freshState.getMode() }],
@@ -170,7 +168,7 @@ class Tokenizer {
170168

171169
if (t.isOpaqueToken) {
172170
// Should not do any smartness to detect brackets on this token
173-
ret.tokens.push(new supports.Token(tokenStartIndex + offsetDelta, t.tokenType));
171+
ret.tokens.push(new Token(tokenStartIndex + offsetDelta, t.tokenType));
174172
continue;
175173
}
176174

@@ -206,27 +204,27 @@ class Tokenizer {
206204
if (isBracket) {
207205
if (tokenStartIndex < i) {
208206
// push a token before character `i`
209-
ret.tokens.push(new supports.Token(tokenStartIndex + offsetDelta, t.tokenType));
207+
ret.tokens.push(new Token(tokenStartIndex + offsetDelta, t.tokenType));
210208
tokenStartIndex = i;
211209
}
212210

213211
// push character `i` as a token
214-
ret.tokens.push(new supports.Token(tokenStartIndex + offsetDelta, isBracket + '.' + t.modeToken));
212+
ret.tokens.push(new Token(tokenStartIndex + offsetDelta, isBracket + '.' + t.modeToken));
215213
tokenStartIndex = i + 1;
216214
}
217215
}
218216

219217
if (tokenStartIndex < tokenEndIndex) {
220218
// push the remaining text as a token
221-
ret.tokens.push(new supports.Token(tokenStartIndex + offsetDelta, t.tokenType));
219+
ret.tokens.push(new Token(tokenStartIndex + offsetDelta, t.tokenType));
222220
}
223221
}
224222

225223
return ret;
226224
}
227225
}
228226

229-
function decodeTextMateToken(modeId:string, entry: textMate.IToken) {
227+
function decodeTextMateToken(modeId:string, entry: ITMToken) {
230228
let tokenTypeArray: string[] = [];
231229
for (let level = 1 /* deliberately skip scope 0*/; level < entry.scopes.length; ++level) {
232230
tokenTypeArray = tokenTypeArray.concat(entry.scopes[level].split('.'));
@@ -289,9 +287,9 @@ var _openSquare = '['.charCodeAt(0);
289287
var _closeSquare = ']'.charCodeAt(0);
290288

291289
var characterToBracket = collections.createNumberDictionary<number>();
292-
characterToBracket['('.charCodeAt(0)] = Modes.Bracket.Open;
293-
characterToBracket[')'.charCodeAt(0)] = Modes.Bracket.Close;
294-
characterToBracket['{'.charCodeAt(0)] = Modes.Bracket.Open;
295-
characterToBracket['}'.charCodeAt(0)] = Modes.Bracket.Close;
296-
characterToBracket['['.charCodeAt(0)] = Modes.Bracket.Open;
297-
characterToBracket[']'.charCodeAt(0)] = Modes.Bracket.Close;
290+
characterToBracket['('.charCodeAt(0)] = Bracket.Open;
291+
characterToBracket[')'.charCodeAt(0)] = Bracket.Close;
292+
characterToBracket['{'.charCodeAt(0)] = Bracket.Open;
293+
characterToBracket['}'.charCodeAt(0)] = Bracket.Close;
294+
characterToBracket['['.charCodeAt(0)] = Bracket.Open;
295+
characterToBracket[']'.charCodeAt(0)] = Bracket.Close;

‎src/vs/editor/node/textMate/vscode-textmate.d.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ export interface IGrammar {
5656
}
5757

5858
export interface ITokenizeLineResult {
59-
tokens: IToken[];
59+
tokens: ITMToken[];
6060
/**
6161
* The `prevState` to be passed on to the next line tokenization.
6262
*/
6363
ruleStack: StackElement[];
6464
}
6565

66-
export interface IToken {
66+
export interface ITMToken {
6767
startIndex: number;
6868
endIndex: number;
6969
scopes: string[];

‎src/vs/editor/standalone-languages/all.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import {ILanguageDef} from './types';
99

10-
import 'vs/languages/json/common/json.contribution';
11-
1210
this.MonacoEditorLanguages = this.MonacoEditorLanguages || [];
1311
let MonacoEditorLanguages: ILanguageDef[] = this.MonacoEditorLanguages;
1412

‎src/vs/editor/standalone-languages/test/bat.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
'use strict';
77

8-
import languageDef = require('vs/editor/standalone-languages/bat');
9-
import T = require('vs/editor/standalone-languages/test/testUtil');
8+
import {language} from 'vs/editor/standalone-languages/bat';
9+
import {testOnEnter, testTokenization} from 'vs/editor/standalone-languages/test/testUtil';
1010

11-
T.testTokenization('bat', languageDef.language, [
11+
testTokenization('bat', language, [
1212
// support.functions
1313
[{
1414
line: '@echo off title Selfhost',
@@ -333,7 +333,7 @@ T.testTokenization('bat', languageDef.language, [
333333
]}]
334334
]);
335335

336-
T.testOnEnter('bat', languageDef.language, (assertOnEnter) => {
336+
testOnEnter('bat', language, (assertOnEnter) => {
337337
assertOnEnter.nothing('', ' a', '');
338338
assertOnEnter.indents('', ' {', '');
339339
assertOnEnter.indents('', '( ', '');

‎src/vs/editor/standalone-languages/test/coffee.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55

66
'use strict';
77

8-
import languageDef = require('vs/editor/standalone-languages/coffee');
9-
import T = require('vs/editor/standalone-languages/test/testUtil');
8+
import {language} from 'vs/editor/standalone-languages/coffee';
9+
import {testOnEnter, testTokenization} from 'vs/editor/standalone-languages/test/testUtil';
1010

1111
var Bracket = {
1212
Open: 1,
1313
Close: -1
1414
};
1515

16-
T.testOnEnter('coffeescript', languageDef.language, (assertOnEnter) => {
16+
testOnEnter('coffeescript', language, (assertOnEnter) => {
1717
assertOnEnter.nothing('', ' a', '');
1818
assertOnEnter.indents('', ' {', '');
1919
assertOnEnter.indents('', '( ', '');
2020
assertOnEnter.indents('', ' [ ', '');
2121
assertOnEnter.indentsOutdents('', ' { ', ' } ');
2222
});
2323

24-
T.testTokenization('coffeescript', languageDef.language, [
24+
testTokenization('coffeescript', language, [
2525
// Comments
2626
[{
2727
line: '#',

‎src/vs/editor/standalone-languages/test/cpp.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
'use strict';
77

8-
import languageDef = require('vs/editor/standalone-languages/cpp');
9-
import T = require('vs/editor/standalone-languages/test/testUtil');
8+
import {language} from 'vs/editor/standalone-languages/cpp';
9+
import {testOnEnter, testTokenization} from 'vs/editor/standalone-languages/test/testUtil';
1010

1111
var Bracket = {
1212
Open: 1,
1313
Close: -1
1414
};
1515

16-
T.testOnEnter('cpp', languageDef.language, (assertOnEnter) => {
16+
testOnEnter('cpp', language, (assertOnEnter) => {
1717
assertOnEnter.nothing('', ' a', '');
1818
assertOnEnter.indents('', ' <', '');
1919
assertOnEnter.indents('', ' {', '');
@@ -22,7 +22,7 @@ T.testOnEnter('cpp', languageDef.language, (assertOnEnter) => {
2222
assertOnEnter.indentsOutdents('', ' { ', ' } ');
2323
});
2424

25-
T.testTokenization('cpp', languageDef.language, [
25+
testTokenization('cpp', language, [
2626
// Keywords
2727
[{
2828
line: 'int _tmain(int argc, _TCHAR* argv[])',

‎src/vs/editor/standalone-languages/test/csharp.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
'use strict';
77

8-
import languageDef = require('vs/editor/standalone-languages/csharp');
9-
import T = require('vs/editor/standalone-languages/test/testUtil');
8+
import {language} from 'vs/editor/standalone-languages/csharp';
9+
import {testTokenization} from 'vs/editor/standalone-languages/test/testUtil';
1010

1111
var Bracket = {
1212
Open: 1,
1313
Close: -1
1414
};
1515

16-
T.testTokenization('csharp', languageDef.language, [
16+
testTokenization('csharp', language, [
1717

1818
// Generated from sample
1919
[{

0 commit comments

Comments
 (0)