diff --git a/src/vs/editor/common/model/textModelWithTokens.ts b/src/vs/editor/common/model/textModelWithTokens.ts index a2f5f56ebe81258e5798d01e10d2d187757b406d..f8ee238e93a6f4255c653df1886e8f70ce1d6a0a 100644 --- a/src/vs/editor/common/model/textModelWithTokens.ts +++ b/src/vs/editor/common/model/textModelWithTokens.ts @@ -149,20 +149,10 @@ class LineContext implements ILineContext { return this._lineTokens.getTokenStartIndex(tokenIndex); } - public getTokenEndIndex(tokenIndex:number): number { - return this._lineTokens.getTokenEndIndex(tokenIndex, this._text.length); - } - public getTokenType(tokenIndex:number): string { return this._lineTokens.getTokenType(tokenIndex); } - public getTokenText(tokenIndex:number): string { - var startIndex = this._lineTokens.getTokenStartIndex(tokenIndex); - var endIndex = this._lineTokens.getTokenEndIndex(tokenIndex, this._text.length); - return this._text.substring(startIndex, endIndex); - } - public findIndexOfOffset(offset:number): number { return this._lineTokens.findIndexOfOffset(offset); } diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 37cb4713ee5e2a15acd1560a18d0ba56be6823be..95c17b3f2f129c2b28936337edffa1328d99fe57 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -176,8 +176,6 @@ export interface ILineContext { getTokenCount(): number; getTokenStartIndex(tokenIndex:number): number; getTokenType(tokenIndex:number): string; - getTokenText(tokenIndex:number): string; - getTokenEndIndex(tokenIndex:number): number; findIndexOfOffset(offset:number): number; } diff --git a/src/vs/editor/common/modes/supports.ts b/src/vs/editor/common/modes/supports.ts index 7a7a33c568b84fc5ad3e395d9591a97dbef56c88..4b3e0559774f5e6a372837c5dbcc281650d9abc3 100644 --- a/src/vs/editor/common/modes/supports.ts +++ b/src/vs/editor/common/modes/supports.ts @@ -92,17 +92,9 @@ export class FilteredLineContext implements modes.ILineContext { return this._actual.getTokenStartIndex(tokenIndex + this._firstTokenInModeIndex) - this._firstTokenCharacterOffset; } - public getTokenEndIndex(tokenIndex:number): number { - return this._actual.getTokenEndIndex(tokenIndex + this._firstTokenInModeIndex) - this._firstTokenCharacterOffset; - } - public getTokenType(tokenIndex:number): string { return this._actual.getTokenType(tokenIndex + this._firstTokenInModeIndex); } - - public getTokenText(tokenIndex:number): string { - return this._actual.getTokenText(tokenIndex + this._firstTokenInModeIndex); - } } const IGNORE_IN_TOKENS = /\b(comment|string|regex)\b/; diff --git a/src/vs/editor/test/common/modesTestUtils.ts b/src/vs/editor/test/common/modesTestUtils.ts index 2fb8d9ee0b36c5d5c4840011eefffd3e95cf4b11..d59f9c6af6185ffc2d2bde1c5929167e9b9fa5df 100644 --- a/src/vs/editor/test/common/modesTestUtils.ts +++ b/src/vs/editor/test/common/modesTestUtils.ts @@ -56,13 +56,6 @@ class TestLineContext implements modes.ILineContext { return this._tokens[tokenIndex].startIndex; } - public getTokenEndIndex(tokenIndex:number): number { - if (tokenIndex + 1 < this._tokens.length) { - return this._tokens[tokenIndex + 1].startIndex; - } - return this._line.length; - } - public getTokenType(tokenIndex:number): string { return this._tokens[tokenIndex].type; } @@ -70,10 +63,4 @@ class TestLineContext implements modes.ILineContext { public findIndexOfOffset(offset:number): number { return Arrays.findIndexInSegmentsArray(this._tokens, offset); } - - public getTokenText(tokenIndex:number): string { - let startIndex = this._tokens[tokenIndex].startIndex; - let endIndex = tokenIndex + 1 < this._tokens.length ? this._tokens[tokenIndex + 1].startIndex : this._line.length; - return this._line.substring(startIndex, endIndex); - } } \ No newline at end of file