💄 remove unused kind-property from SelectionRange

microsoft · May 27, 2019 · 6526507 · 6526507
1 parent a1a7af5
commit 6526507
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1094,7 +1094,6 @@ export interface DocumentColorProvider { @@
     }
     export interface SelectionRange {
-    	kind: string;
     	range: IRange;
     }
@@ Expand Down @@