From 652650732653c4c4ac1f0f54788486e76aea516e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 27 May 2019 17:04:40 +0200 Subject: [PATCH] :lipstick: remove unused kind-property from SelectionRange --- src/vs/editor/common/modes.ts | 1 - .../editor/contrib/smartSelect/bracketSelections.ts | 12 ++++++------ .../contrib/smartSelect/test/smartSelect.test.ts | 6 +++--- src/vs/editor/contrib/smartSelect/wordSelections.ts | 8 ++++---- src/vs/monaco.d.ts | 1 - src/vs/workbench/api/common/extHostTypeConverters.ts | 5 +---- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index f5c02abdf05fe..aea28ac21616a 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -1094,7 +1094,6 @@ export interface DocumentColorProvider { } export interface SelectionRange { - kind: string; range: IRange; } diff --git a/src/vs/editor/contrib/smartSelect/bracketSelections.ts b/src/vs/editor/contrib/smartSelect/bracketSelections.ts index 6bd8d8842353c..728c4573f8bef 100644 --- a/src/vs/editor/contrib/smartSelect/bracketSelections.ts +++ b/src/vs/editor/contrib/smartSelect/bracketSelections.ts @@ -115,8 +115,8 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider { } const innerBracket = Range.fromPositions(bracket.range.getEndPosition(), closing!.getStartPosition()); const outerBracket = Range.fromPositions(bracket.range.getStartPosition(), closing!.getEndPosition()); - bucket.push({ range: innerBracket, kind: 'statement.brackets' }); - bucket.push({ range: outerBracket, kind: 'statement.brackets.full' }); + bucket.push({ range: innerBracket }); + bucket.push({ range: outerBracket }); BracketSelectionRangeProvider._addBracketLeading(model, outerBracket, bucket); } } @@ -135,8 +135,8 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider { const startLine = bracket.startLineNumber; const column = model.getLineFirstNonWhitespaceColumn(startLine); if (column !== 0 && column !== bracket.startColumn) { - bucket.push({ range: Range.fromPositions(new Position(startLine, column), bracket.getEndPosition()), kind: 'statement.brackets.leading' }); - bucket.push({ range: Range.fromPositions(new Position(startLine, 1), bracket.getEndPosition()), kind: 'statement.brackets.leading.full' }); + bucket.push({ range: Range.fromPositions(new Position(startLine, column), bracket.getEndPosition()) }); + bucket.push({ range: Range.fromPositions(new Position(startLine, 1), bracket.getEndPosition()) }); } // xxxxxxxx @@ -147,8 +147,8 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider { if (aboveLine > 0) { const column = model.getLineFirstNonWhitespaceColumn(aboveLine); if (column === bracket.startColumn && column !== model.getLineLastNonWhitespaceColumn(aboveLine)) { - bucket.push({ range: Range.fromPositions(new Position(aboveLine, column), bracket.getEndPosition()), kind: 'statement.brackets.leading' }); - bucket.push({ range: Range.fromPositions(new Position(aboveLine, 1), bracket.getEndPosition()), kind: 'statement.brackets.leading.full' }); + bucket.push({ range: Range.fromPositions(new Position(aboveLine, column), bracket.getEndPosition()) }); + bucket.push({ range: Range.fromPositions(new Position(aboveLine, 1), bracket.getEndPosition()) }); } } } diff --git a/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts b/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts index b26f7fdc08f7a..4263a1b4ac93f 100644 --- a/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts +++ b/src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts @@ -326,9 +326,9 @@ suite('SmartSelect', () => { const reg = SelectionRangeRegistry.register('*', { provideSelectionRanges() { return [[ - { range: { startLineNumber: 1, startColumn: 10, endLineNumber: 1, endColumn: 11 }, kind: 'somekind' }, - { range: { startLineNumber: 1, startColumn: 10, endLineNumber: 3, endColumn: 2 }, kind: 'somekind' }, - { range: { startLineNumber: 1, startColumn: 1, endLineNumber: 3, endColumn: 2 }, kind: 'somekind' }, + { range: { startLineNumber: 1, startColumn: 10, endLineNumber: 1, endColumn: 11 } }, + { range: { startLineNumber: 1, startColumn: 10, endLineNumber: 3, endColumn: 2 } }, + { range: { startLineNumber: 1, startColumn: 1, endLineNumber: 3, endColumn: 2 } }, ]]; } }); diff --git a/src/vs/editor/contrib/smartSelect/wordSelections.ts b/src/vs/editor/contrib/smartSelect/wordSelections.ts index 1dcabbd65c9f3..7402202af549e 100644 --- a/src/vs/editor/contrib/smartSelect/wordSelections.ts +++ b/src/vs/editor/contrib/smartSelect/wordSelections.ts @@ -20,7 +20,7 @@ export class WordSelectionRangeProvider implements SelectionRangeProvider { this._addInWordRanges(bucket, model, position); this._addWordRanges(bucket, model, position); this._addWhitespaceLine(bucket, model, position); - bucket.push({ range: model.getFullModelRange(), kind: 'statement.all' }); + bucket.push({ range: model.getFullModelRange() }); } return result; } @@ -65,14 +65,14 @@ export class WordSelectionRangeProvider implements SelectionRangeProvider { } if (start < end) { - bucket.push({ range: new Range(pos.lineNumber, startColumn + start, pos.lineNumber, startColumn + end), kind: 'statement.word.part' }); + bucket.push({ range: new Range(pos.lineNumber, startColumn + start, pos.lineNumber, startColumn + end) }); } } private _addWordRanges(bucket: SelectionRange[], model: ITextModel, pos: Position): void { const word = model.getWordAtPosition(pos); if (word) { - bucket.push({ range: new Range(pos.lineNumber, word.startColumn, pos.lineNumber, word.endColumn), kind: 'statement.word' }); + bucket.push({ range: new Range(pos.lineNumber, word.startColumn, pos.lineNumber, word.endColumn) }); } } @@ -81,7 +81,7 @@ export class WordSelectionRangeProvider implements SelectionRangeProvider { && model.getLineFirstNonWhitespaceColumn(pos.lineNumber) === 0 && model.getLineLastNonWhitespaceColumn(pos.lineNumber) === 0 ) { - bucket.push({ range: new Range(pos.lineNumber, 1, pos.lineNumber, model.getLineMaxColumn(pos.lineNumber)), kind: 'statement.line' }); + bucket.push({ range: new Range(pos.lineNumber, 1, pos.lineNumber, model.getLineMaxColumn(pos.lineNumber)) }); } } } diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 625a470701555..2405c549d1099 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -5343,7 +5343,6 @@ declare namespace monaco.languages { } export interface SelectionRange { - kind: string; range: IRange; } diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts index 49c911e2f9c06..df40f2256ffa4 100644 --- a/src/vs/workbench/api/common/extHostTypeConverters.ts +++ b/src/vs/workbench/api/common/extHostTypeConverters.ts @@ -859,10 +859,7 @@ export namespace Color { export namespace SelectionRange { export function from(obj: vscode.SelectionRange): modes.SelectionRange { - return { - kind: '', - range: Range.from(obj.range) - }; + return { range: Range.from(obj.range) }; } export function to(obj: modes.SelectionRange): vscode.SelectionRange {