Remove modes.Bracket

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

@@ -698,8 +698,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 					// Treat the rest of the line (if above limit) as one default token
 					r.tokens.push({
 						startIndex: r.actualStopOffset,
-						type: '',
-						bracket: 0
+						type: ''
 					});
 
 					// Use as end state the starting state

src/vs/editor/common/modes.ts

@@ -23,15 +23,9 @@ export interface IWorkerParticipant {
 
 }
 
-export enum Bracket {
-	None = 0,
-	Open = 1,
-	Close = -1
-}
-
 export interface ITokenizationResult {
 	type?:string;
-	bracket?:Bracket;
+	dontMergeWithPrev?:boolean;
 	nextState?:IState;
 }
 
@@ -304,7 +298,6 @@ export interface IMode {
 export interface IToken {
 	startIndex:number;
 	type:string;
-	bracket?:Bracket;
 }
 
 export interface IModeTransition {

src/vs/editor/common/modes/supports/tokenizationSupport.ts

@@ -218,7 +218,7 @@ export class TokenizationSupport implements modes.ITokenizationSupport, IDisposa
 				}
 			} while (!tokenResult.type && tokenResult.type !== '');
 
-			if (previousType !== tokenResult.type || tokenResult.bracket || previousType === null) {
+			if (previousType !== tokenResult.type || tokenResult.dontMergeWithPrev || previousType === null) {
 				prependTokens.push(new Token(beforeTokenizeStreamPos + deltaOffset, tokenResult.type));
 			}
 

src/vs/languages/html/common/html.ts

@@ -97,7 +97,7 @@ export class State extends AbstractState {
 
 				} else if(stream.advanceIfString2('-->')) {
 					this.kind = States.Content;
-					return { type: htmlTokenTypes.DELIM_COMMENT, bracket: Modes.Bracket.Close };
+					return { type: htmlTokenTypes.DELIM_COMMENT, dontMergeWithPrev: true };
 				}
 				break;
 
@@ -106,7 +106,7 @@ export class State extends AbstractState {
 					return { type: htmlTokenTypes.DOCTYPE};
 				} else if(stream.advanceIfString2('>')) {
 					this.kind = States.Content;
-					return { type: htmlTokenTypes.DELIM_DOCTYPE, bracket: Modes.Bracket.Close };
+					return { type: htmlTokenTypes.DELIM_DOCTYPE, dontMergeWithPrev: true };
 				}
 			break;
 
@@ -115,19 +115,19 @@ export class State extends AbstractState {
 					if (!stream.eos() && stream.peek() === '!') {
 						if (stream.advanceIfString2('!--')) {
 							this.kind = States.WithinComment;
-							return { type: htmlTokenTypes.DELIM_COMMENT, bracket: Modes.Bracket.Open };
+							return { type: htmlTokenTypes.DELIM_COMMENT, dontMergeWithPrev: true };
 						}
 						if (stream.advanceIfStringCaseInsensitive2('!DOCTYPE')) {
 							this.kind = States.WithinDoctype;
-							return { type: htmlTokenTypes.DELIM_DOCTYPE, bracket: Modes.Bracket.Open };
+							return { type: htmlTokenTypes.DELIM_DOCTYPE, dontMergeWithPrev: true };
 						}
 					}
 					if (stream.advanceIfCharCode2('/'.charCodeAt(0))) {
 						this.kind = States.OpeningEndTag;
-						return { type: htmlTokenTypes.DELIM_END, bracket: Modes.Bracket.Open };
+						return { type: htmlTokenTypes.DELIM_END, dontMergeWithPrev: true };
 					}
 					this.kind = States.OpeningStartTag;
-					return { type: htmlTokenTypes.DELIM_START, bracket: Modes.Bracket.Open };
+					return { type: htmlTokenTypes.DELIM_START, dontMergeWithPrev: true };
 				}
 				break;
 
@@ -140,7 +140,7 @@ export class State extends AbstractState {
 
 				} else if (stream.advanceIfString2('>')) {
 					this.kind = States.Content;
-					return { type: htmlTokenTypes.DELIM_END, bracket: Modes.Bracket.Close };
+					return { type: htmlTokenTypes.DELIM_END, dontMergeWithPrev: true };
 
 				} else {
 					stream.advanceUntilString2('>', false);
@@ -174,14 +174,14 @@ export class State extends AbstractState {
 
 					} else if (stream.advanceIfString2('/>')) {
 							this.kind = States.Content;
-							return { type: htmlTokenTypes.DELIM_START, bracket: Modes.Bracket.Close };
+							return { type: htmlTokenTypes.DELIM_START, dontMergeWithPrev: true };
 					} if (stream.advanceIfCharCode2('>'.charCodeAt(0))) {
 						if (tagsEmbeddingContent.indexOf(this.lastTagName) !== -1) {
 							this.kind = States.WithinEmbeddedContent;
-							return { type: htmlTokenTypes.DELIM_START, bracket: Modes.Bracket.Close };
+							return { type: htmlTokenTypes.DELIM_START, dontMergeWithPrev: true };
 						} else {
 							this.kind = States.Content;
-							return { type: htmlTokenTypes.DELIM_START, bracket: Modes.Bracket.Close };
+							return { type: htmlTokenTypes.DELIM_START, dontMergeWithPrev: true };
 						}
 					} else {
 						stream.next2();