diff --git a/src/vs/editor/common/modes/supports.ts b/src/vs/editor/common/modes/supports.ts
index f8701a24c79a9082680cf40f679282a6e23c4851..6741017bcc8e4a7fae70177d64b9b3eeb2a48fac 100644
--- a/src/vs/editor/common/modes/supports.ts
+++ b/src/vs/editor/common/modes/supports.ts
@@ -151,14 +151,3 @@ export class FilteredLineContext implements Modes.ILineContext {
 export function ignoreBracketsInToken(tokenType:string): boolean {
 	return /\b(comment|string|regex)\b/.test(tokenType);
 }
-
-// TODO@Alex -> refactor to use `brackets` from language configuration
-export function getBracketFor(tokenType:string, tokenText:string, mode:Modes.IMode): Modes.Bracket {
-	if (tokenText === '{' || tokenText === '(' || tokenText === '[') {
-		return Modes.Bracket.Open;
-	}
-	if (tokenText === '}' || tokenText === ')' || tokenText === ']') {
-		return Modes.Bracket.Close;
-	}
-	return Modes.Bracket.None;
-}
diff --git a/src/vs/editor/contrib/smartSelect/common/tokenTree.ts b/src/vs/editor/contrib/smartSelect/common/tokenTree.ts
index a1fafe1ddf82a743f1e2dc7450e3a55705432ca2..f637bd2a0e3ead2fa42d11f215df76c50170e52c 100644
--- a/src/vs/editor/contrib/smartSelect/common/tokenTree.ts
+++ b/src/vs/editor/contrib/smartSelect/common/tokenTree.ts
@@ -8,7 +8,8 @@ import EditorCommon = require('vs/editor/common/editorCommon');
 import Modes = require('vs/editor/common/modes');
 import {Range} from 'vs/editor/common/core/range';
 import {Position} from 'vs/editor/common/core/position';
-import {getBracketFor} from 'vs/editor/common/modes/supports';
+import {ignoreBracketsInToken} from 'vs/editor/common/modes/supports';
+import {BracketsUtils} from 'vs/editor/common/modes/supports/electricCharacter';
 
 export class Node {
 
@@ -108,7 +109,12 @@ class TokenScanner {
 	private _versionId: number;
 	private _currentLineNumber: number;
 	private _currentTokenIndex: number;
+	private _currentTokenStart: number;
 	private _currentLineTokens: EditorCommon.ILineTokens;
+	private _currentLineModeTransitions: Modes.IModeTransition[];
+	private _currentModeIndex: number;
+	private _nextModeStart: number;
+	private _currentModeBrackets: Modes.IRichEditBrackets;
 	private _currentLineText: string;
 
 	constructor(model: EditorCommon.IModel) {
@@ -130,31 +136,86 @@ class TokenScanner {
 			// no tokens for this line
 			this._currentLineTokens = this._model.getLineTokens(this._currentLineNumber);
 			this._currentLineText = this._model.getLineContent(this._currentLineNumber);
+			this._currentLineModeTransitions = this._model._getLineModeTransitions(this._currentLineNumber);
 			this._currentTokenIndex = 0;
+			this._currentTokenStart = 0;
+			this._currentModeIndex = -1;
+			this._nextModeStart = 0;
 		}
 		if (this._currentTokenIndex >= this._currentLineTokens.getTokenCount()) {
 			// last token of line visited
 			this._currentLineNumber += 1;
 			this._currentLineTokens = null;
-			this._currentLineText = null;
 			return this.next();
 		}
+
+		if (this._currentTokenStart >= this._nextModeStart) {
+			this._currentModeIndex++;
+			this._nextModeStart = (this._currentModeIndex + 1 < this._currentLineModeTransitions.length ? this._currentLineModeTransitions[this._currentModeIndex + 1].startIndex : this._currentLineText.length + 1);
+			let mode = (this._currentModeIndex < this._currentLineModeTransitions.length ? this._currentLineModeTransitions[this._currentModeIndex] : null);
+			this._currentModeBrackets = (mode && mode.mode.richEditSupport ? mode.mode.richEditSupport.brackets : null);
+		}
+
 		let tokenType = this._currentLineTokens.getTokenType(this._currentTokenIndex);
-		let tokenStartIndex = this._currentLineTokens.getTokenStartIndex(this._currentTokenIndex);
-		let tokenEndIndex = this._currentLineTokens.getTokenEndIndex(this._currentTokenIndex, this._currentLineText.length + 1);
-		let tokenText = this._currentLineText.substring(tokenStartIndex, tokenEndIndex);
-		var token: Token = {
-			type: tokenType,
-			bracket: getBracketFor(tokenType, tokenText, this._model.getMode()),
+		let tokenEndIndex = this._currentLineTokens.getTokenEndIndex(this._currentTokenIndex, this._currentLineText.length);
+
+		let nextBracket: Range = null;
+		if (this._currentModeBrackets && !ignoreBracketsInToken(tokenType)) {
+			nextBracket = BracketsUtils.findNextBracketInToken(this._currentModeBrackets.forwardRegex, this._currentLineNumber, this._currentLineText, this._currentTokenStart, tokenEndIndex);
+		}
+
+		if (nextBracket && this._currentTokenStart < nextBracket.startColumn - 1) {
+			// found a bracket, but it is not at the beginning of the token
+			tokenEndIndex = nextBracket.startColumn - 1;
+			nextBracket = null;
+		}
+
+		let bracketData: EditorCommon.IRichEditBracket = null;
+		let bracketIsOpen: boolean = false;
+		if (nextBracket) {
+			let bracketText = this._currentLineText.substring(nextBracket.startColumn - 1, nextBracket.endColumn - 1);
+			bracketData = this._currentModeBrackets.textIsBracket[bracketText];
+			bracketIsOpen = this._currentModeBrackets.textIsOpenBracket[bracketText];
+		}
+
+		if (!bracketData) {
+			let token: Token = {
+				type: tokenType,
+				bracket: Modes.Bracket.None,
+				range: {
+					startLineNumber: this._currentLineNumber,
+					startColumn: 1 + this._currentTokenStart,
+					endLineNumber: this._currentLineNumber,
+					endColumn: 1 + tokenEndIndex
+				}
+			};
+			// console.log('TOKEN: <<' + this._currentLineText.substring(this._currentTokenStart, tokenEndIndex) + '>>');
+
+			this._currentTokenIndex += 1;
+			this._currentTokenStart = (this._currentTokenIndex < this._currentLineTokens.getTokenCount() ? this._currentLineTokens.getTokenStartIndex(this._currentTokenIndex) : 0);
+			return token;
+		}
+
+		let type = `${bracketData.modeId};${bracketData.open};${bracketData.close}`;
+		let token: Token = {
+			type: type,
+			bracket: bracketIsOpen ? Modes.Bracket.Open : Modes.Bracket.Close,
 			range: {
 				startLineNumber: this._currentLineNumber,
-				startColumn: 1 + tokenStartIndex,
+				startColumn: 1 + this._currentTokenStart,
 				endLineNumber: this._currentLineNumber,
-				endColumn: 1 + tokenEndIndex
+				endColumn: nextBracket.endColumn
 			}
 		};
-		//		token.__debugContent = this._model.getValueInRange(token.range);
-		this._currentTokenIndex += 1;
+		// console.log('BRACKET: <<' + this._currentLineText.substring(this._currentTokenStart, nextBracket.endColumn - 1) + '>>');
+
+		if (nextBracket.endColumn - 1 < tokenEndIndex) {
+			// found a bracket, but it is not at the end of the token
+			this._currentTokenStart = nextBracket.endColumn - 1;
+		} else {
+			this._currentTokenIndex += 1;
+			this._currentTokenStart = (this._currentTokenIndex < this._currentLineTokens.getTokenCount() ? this._currentLineTokens.getTokenStartIndex(this._currentTokenIndex) : 0);
+		}
 		return token;
 	}
 }
diff --git a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts
index c42b8ecaac893df5a55ba319677db92efd18f97e..7c7615bcbe7446e63d240e1186b19fb886dcac47 100644
--- a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts
+++ b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts
@@ -52,13 +52,13 @@ suite('TokenSelectionSupport', () => {
 			'\t}',
 			'}'
 		], 3, 20, [
-			new Range(1, 1, 5, 3),
-			new Range(1, 21, 5, 3),
-			new Range(2, 1, 4, 4),
-			new Range(2, 11, 4, 4),
+			new Range(1, 1, 5, 2),
+			new Range(1, 21, 5, 2),
+			new Range(2, 1, 4, 3),
+			new Range(2, 11, 4, 3),
 			new Range(3, 1, 4, 2),
-			new Range(3, 1, 3, 28),
-			new Range(3, 10, 3, 28),
+			new Range(3, 1, 3, 27),
+			new Range(3, 10, 3, 27),
 			new Range(3, 11, 3, 26),
 			new Range(3, 17, 3, 26),
 			new Range(3, 18, 3, 25),