Moves bracket logic from text model into BracketPairsImpl (IBracketPairs)

src/vs/editor/common/controller/cursorTypeOperations.ts

@@ -739,7 +739,7 @@ export class TypeOperations {
 
 		if (electricAction.matchOpenBracket) {
 			let endColumn = (lineTokens.getLineContent() + ch).lastIndexOf(electricAction.matchOpenBracket) + 1;
-			let match = model.findMatchingBracketUp(electricAction.matchOpenBracket, {
+			let match = model.bracketPairs.findMatchingBracketUp(electricAction.matchOpenBracket, {
 				lineNumber: position.lineNumber,
 				column: endColumn
 			});

src/vs/editor/common/model.ts

@@ -529,16 +529,6 @@ export class FindMatch {
 	}
 }
 
-/**
- * @internal
- */
-export interface IFoundBracket {
-	range: Range;
-	open: string[];
-	close: string[];
-	isOpen: boolean;
-}
-
 /**
  * Describes the behavior of decorations when typing/editing near their edges.
  * Note: Please do not edit the values, as they very carefully match `DecorationRangeBehavior`
@@ -968,46 +958,6 @@ export interface ITextModel {
 	 */
 	getWordUntilPosition(position: IPosition): IWordAtPosition;
 
-	/**
-	 * Find the matching bracket of `request` up, counting brackets.
-	 * @param request The bracket we're searching for
-	 * @param position The position at which to start the search.
-	 * @return The range of the matching bracket, or null if the bracket match was not found.
-	 * @internal
-	 */
-	findMatchingBracketUp(bracket: string, position: IPosition): Range | null;
-
-	/**
-	 * Find the first bracket in the model before `position`.
-	 * @param position The position at which to start the search.
-	 * @return The info for the first bracket before `position`, or null if there are no more brackets before `positions`.
-	 * @internal
-	 */
-	findPrevBracket(position: IPosition): IFoundBracket | null;
-
-	/**
-	 * Find the first bracket in the model after `position`.
-	 * @param position The position at which to start the search.
-	 * @return The info for the first bracket after `position`, or null if there are no more brackets after `positions`.
-	 * @internal
-	 */
-	findNextBracket(position: IPosition): IFoundBracket | null;
-
-	/**
-	 * Find the enclosing brackets that contain `position`.
-	 * @param position The position at which to start the search.
-	 * @internal
-	 */
-	findEnclosingBrackets(position: IPosition, maxDuration?: number): [Range, Range] | null;
-
-	/**
-	 * Given a `position`, if the position is on top or near a bracket,
-	 * find the matching bracket of that bracket and return the ranges of both brackets.
-	 * @param position The position at which to look for a bracket.
-	 * @internal
-	 */
-	matchBracket(position: IPosition): [Range, Range] | null;
-
 	/**
 	 * @internal
 	 */

src/vs/editor/common/model/bracketPairs/bracketPairs.ts

@@ -4,24 +4,70 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from 'vs/base/common/event';
-import { Range } from 'vs/editor/common/core/range';
+import { IPosition } from 'vs/editor/common/core/position';
+import { IRange, Range } from 'vs/editor/common/core/range';
 
 export interface IBracketPairs {
+	/**
+	 * Is fired when bracket pairs change, either due to a text or a settings change.
+	*/
+	onDidChange: Event<void>;
+
 	/**
 	 * Gets all bracket pairs that intersect the given position.
 	 * The result is sorted by the start position.
 	 */
-	getBracketPairsInRange(range: Range): BracketPairInfo[];
+	getBracketPairsInRange(range: IRange): BracketPairInfo[];
 
 	/**
 	 * Gets all bracket pairs that intersect the given position.
 	 * The result is sorted by the start position.
 	 */
-	getBracketPairsInRangeWithMinIndentation(range: Range): BracketPairWithMinIndentationInfo[];
+	getBracketPairsInRangeWithMinIndentation(range: IRange): BracketPairWithMinIndentationInfo[];
 
-	getBracketsInRange(range: Range): BracketInfo[];
+	getBracketsInRange(range: IRange): BracketInfo[];
 
-	onDidChange: Event<void>;
+	/**
+	 * Find the matching bracket of `request` up, counting brackets.
+	 * @param request The bracket we're searching for
+	 * @param position The position at which to start the search.
+	 * @return The range of the matching bracket, or null if the bracket match was not found.
+	 */
+	findMatchingBracketUp(bracket: string, position: IPosition): Range | null;
+
+	/**
+	 * Find the first bracket in the model before `position`.
+	 * @param position The position at which to start the search.
+	 * @return The info for the first bracket before `position`, or null if there are no more brackets before `positions`.
+	 */
+	findPrevBracket(position: IPosition): IFoundBracket | null;
+
+	/**
+	 * Find the first bracket in the model after `position`.
+	 * @param position The position at which to start the search.
+	 * @return The info for the first bracket after `position`, or null if there are no more brackets after `positions`.
+	 */
+	findNextBracket(position: IPosition): IFoundBracket | null;
+
+	/**
+	 * Find the enclosing brackets that contain `position`.
+	 * @param position The position at which to start the search.
+	 */
+	findEnclosingBrackets(position: IPosition, maxDuration?: number): [Range, Range] | null;
+
+	/**
+	 * Given a `position`, if the position is on top or near a bracket,
+	 * find the matching bracket of that bracket and return the ranges of both brackets.
+	 * @param position The position at which to look for a bracket.
+	 */
+	matchBracket(position: IPosition): [Range, Range] | null;
+}
+
+export interface IFoundBracket {
+	range: Range;
+	open: string[];
+	close: string[];
+	isOpen: boolean;
 }
 
 export class BracketInfo {