Migrate final users of electricCharacter.onEnter to onEnterRules

src/vs/editor/common/modes.ts

@@ -752,7 +752,6 @@ export interface IRichEditElectricCharacter {
 	getElectricCharacters():string[];
 	// Should return opening bracket type to match indentation with
 	onElectricCharacter(context:ILineContext, offset:number):IElectricAction;
-	onEnter(context:ILineContext, offset:number):IEnterAction;
 }
 
 export interface IRichEditOnEnter {

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

@@ -57,18 +57,6 @@ export class BracketElectricCharacterSupport implements Modes.IRichEditElectricC
 			}
 		});
 	}
-
-	public onEnter(context: Modes.ILineContext, offset: number): Modes.IEnterAction {
-		return handleEvent(context, offset, (nestedMode:Modes.IMode, context:Modes.ILineContext, offset:number) => {
-			if (this._modeId === nestedMode.getId()) {
-				return this.brackets.onEnter(context, offset);
-			} else if (nestedMode.richEditSupport && nestedMode.richEditSupport.electricCharacter) {
-				return nestedMode.richEditSupport.electricCharacter.onEnter(context, offset);
-			} else {
-				return null;
-			}
-		});
-	}
 }
 
 enum Lettercase { Unknown, Lowercase, Uppercase, Camelcase}
@@ -146,14 +134,6 @@ export class Brackets {
 		return result;
 	}
 
-	public onEnter(context: Modes.ILineContext, offset: number): Modes.IEnterAction {
-		if (context.getTokenCount() === 0) {
-			return null;
-		}
-
-		return this._onEnterRegexBrackets(context, offset);
-	}
-
 	public onElectricCharacter(context: Modes.ILineContext, offset: number): Modes.IElectricAction {
 		if (context.getTokenCount() === 0) {
 			return null;
@@ -190,38 +170,6 @@ export class Brackets {
 		return true;
 	}
 
-	private _onEnterRegexBrackets(context: Modes.ILineContext, offset: number): Modes.IEnterAction {
-		// Handle regular expression brackets
-		for (var i = 0; i < this.regexBrackets.length; ++i) {
-			var regexBracket = this.regexBrackets[i];
-			var line = context.getLineContent();
-
-			if (this.caseInsensitive) {
-				line = line.toLowerCase(); // Even with the /../i regexes we need this for the indexof below
-			}
-
-			// Check if an open bracket matches the line up to offset.
-			var matchLine = line.substr(0, offset);
-			var matches = matchLine.match(regexBracket.open);
-
-			if (matches) {
-
-				// The opening bracket matches. Check the closing one.
-				if (regexBracket.closeComplete) {
-					matchLine = line.substring(offset);
-					var matchAfter = matches[0].replace(regexBracket.open, regexBracket.closeComplete);
-					if (matchLine.indexOf(matchAfter) === 0) {
-						return { indentAction: Modes.IndentAction.IndentOutdent };
-					}
-				}
-
-				return { indentAction: Modes.IndentAction.Indent };
-			}
-		}
-
-		return null;
-	}
-
 	private _onElectricCharacterStandardBrackets(context: Modes.ILineContext, offset: number): Modes.IElectricAction {
 		var tokenIndex = context.findIndexOfOffset(offset);
 		var tokenText = context.getTokenText(tokenIndex);

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

@@ -182,32 +182,18 @@ export class OnEnterSupport implements IRichEditOnEnter {
 }
 
 export function getRawEnterActionAtPosition(model:ITokenizedModel, lineNumber:number, column:number): IEnterAction {
-	let enterAction:IEnterAction;
-
+	let result:IEnterAction;
 	let richEditSupport = model.getMode().richEditSupport;
 
 	if (richEditSupport && richEditSupport.onEnter) {
 		try {
-			enterAction = richEditSupport.onEnter.onEnter(model, new Position(lineNumber, column));
+			result = richEditSupport.onEnter.onEnter(model, new Position(lineNumber, column));
 		} catch (e) {
 			onUnexpectedError(e);
 		}
 	}
 
-	if (!enterAction) {
-		if (richEditSupport && richEditSupport.electricCharacter) {
-			let lineContext = model.getLineContext(lineNumber);
-			try {
-				enterAction = richEditSupport.electricCharacter.onEnter(lineContext, column - 1);
-			} catch(e) {
-				onUnexpectedError(e);
-			}
-		}
-	} else {
-		// console.log('USING NEW INDENTATION LOGIC!');
-	}
-
-	return enterAction;
+	return result;
 }
 
 export function getEnterActionAtPosition(model:ITokenizedModel, lineNumber:number, column:number): { enterAction: IEnterAction; indentation: string; } {

src/vs/editor/test/common/controller/cursor.test.ts

@@ -786,10 +786,8 @@ class OnEnterMode extends TestMode {
 	constructor(indentAction: Modes.IndentAction) {
 		super();
 		this.richEditSupport = {
-			electricCharacter: {
-				getElectricCharacters: ():string[] => null,
-				onElectricCharacter: (context:Modes.ILineContext, offset:number): Modes.IElectricAction => null,
-				onEnter: (context:Modes.ILineContext, offset:number): Modes.IEnterAction => {
+			onEnter: {
+				onEnter: (model, position) => {
 					return {
 						indentAction: indentAction
 					};

src/vs/editor/test/common/modes/autoIndentation.test.ts

@@ -39,23 +39,6 @@ suite('Editor Modes - Auto Indentation', () => {
 				close: /<\/(\w[\w\d]*)\s*>$/i }
 		], null, true);
 
-		assert.equal(brackets.onEnter(modesUtil.createLineContextFromTokenText([
-			{ text: '', type: '' }
-		]), 0), null);
-		assert.equal(brackets.onEnter(modesUtil.createLineContextFromTokenText([
-			{ text: '<', type: 'delim' },
-			{ text: 'tag', type: 'tag', bracket: modes.Bracket.Open },
-			{ text: '>', type: 'delim' },
-		]), 5).indentAction, modes.IndentAction.Indent);
-		assert.equal(brackets.onEnter(modesUtil.createLineContextFromTokenText([
-			{ text: '<', type: 'delim' },
-			{ text: 'tag', type: 'tag', bracket: modes.Bracket.Open },
-			{ text: '>', type: 'delim' },
-			{ text: '</', type: 'delim' },
-			{ text: 'TAg', type: 'tag', bracket: modes.Bracket.Close},
-			{ text: '>', type: 'delim' },
-		]), 5).indentAction, modes.IndentAction.IndentOutdent);
-
 		assert.equal(brackets.onElectricCharacter(modesUtil.createLineContextFromTokenText([
 			{ text: '<', type: 'delim' },
 			{ text: 'tag', type: 'tag', bracket: modes.Bracket.Open },

src/vs/editor/test/common/modesUtil.ts

@@ -25,11 +25,6 @@ export interface ITestItem {
 	tokens: IRelaxedToken[];
 }
 
-
-export interface IOnEnterFunc {
-	(line:string, offset:number, state?:modes.IState): modes.IEnterAction;
-}
-
 export interface IOnElectricCharacterFunc {
 	(line:string, offset:number, state?:modes.IState): modes.IElectricAction;
 }
@@ -46,14 +41,6 @@ export function assertWords(actual:string[], expected:string[], message?:string)
 	assert.deepEqual(actual, expected, message);
 }
 
-export function createOnEnter(mode:modes.IMode): IOnEnterFunc {
-	return function onEnter(line:string, offset:number, state?:modes.IState): modes.IEnterAction {
-		state = state || mode.tokenizationSupport.getInitialState();
-		var lineTokens = mode.tokenizationSupport.tokenize(line, state);
-		return mode.richEditSupport.electricCharacter.onEnter(createLineContext(line, lineTokens), offset);
-	};
-}
-
 export function load(modeId: string, preloadModes: string[] = [] ): TPromise<modes.IMode> {
 	var toLoad:string[] = [].concat(preloadModes).concat([modeId]);
 

src/vs/languages/handlebars/common/handlebars.ts

@@ -155,7 +155,19 @@ export class HandlebarsMode extends htmlMode.HTMLMode<htmlWorker.HTMLWorker> {
 					{ open: '"', close: '"' },
 					{ open: '\'', close: '\'' }
 				]
-			}
+			},
+
+			onEnterRules: [
+				{
+					beforeText: new RegExp(`<(?!(?:${htmlMode.EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+					afterText: /^<\/(\w[\w\d]*)\s*>$/i,
+					action: { indentAction: Modes.IndentAction.IndentOutdent }
+				},
+				{
+					beforeText: new RegExp(`<(?!(?:${htmlMode.EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+					action: { indentAction: Modes.IndentAction.Indent }
+				}
+			],
 		});
 	}
 

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

@@ -368,7 +368,19 @@ export class HTMLMode<W extends htmlWorker.HTMLWorker> extends AbstractMode<W> i
 					{ open: '"', close: '"' },
 					{ open: '\'', close: '\'' }
 				]
-			}
+			},
+
+			onEnterRules: [
+				{
+					beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+					afterText: /^<\/(\w[\w\d]*)\s*>$/i,
+					action: { indentAction: Modes.IndentAction.IndentOutdent }
+				},
+				{
+					beforeText: new RegExp(`<(?!(?:${EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+					action: { indentAction: Modes.IndentAction.Indent }
+				}
+			],
 		});
 	}
 

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

@@ -14,18 +14,18 @@ import modesUtil = require('vs/editor/test/common/modesUtil');
 import {Model} from 'vs/editor/common/model/model';
 import Supports = require('vs/editor/common/modes/supports');
 import {getTag, DELIM_END, DELIM_START, DELIM_ASSIGN, ATTRIB_NAME, ATTRIB_VALUE, COMMENT, DELIM_COMMENT, DELIM_DOCTYPE, DOCTYPE} from 'vs/languages/html/common/htmlTokenTypes';
-
+import {getRawEnterActionAtPosition} from 'vs/editor/common/modes/supports/onEnter';
+import {TextModelWithTokens} from 'vs/editor/common/model/textModelWithTokens';
+import {TextModel} from 'vs/editor/common/model/textModel';
 
 suite('Colorizing - HTML', () => {
 
-	var onEnter: modesUtil.IOnEnterFunc;
 	var tokenizationSupport: Modes.ITokenizationSupport;
 	var _mode: Modes.IMode;
 
 	suiteSetup((done) => {
 		modesUtil.load('html').then(mode => {
 			tokenizationSupport = mode.tokenizationSupport;
-			onEnter = modesUtil.createOnEnter(mode);
 			_mode = mode;
 			done();
 		});
@@ -620,21 +620,38 @@ suite('Colorizing - HTML', () => {
 	});
 
 	test('onEnter', function() {
-		assert.equal(onEnter('', 0), null);
-		assert.equal(onEnter('>', 1), null);
-		assert.equal(onEnter('span>', 5), null);
-		assert.equal(onEnter('</span>', 7), null);
-		assert.equal(onEnter('<img />', 7), null);
-		assert.equal(onEnter('<span>', 6).indentAction, Modes.IndentAction.Indent);
-		assert.equal(onEnter('<p>', 3).indentAction, Modes.IndentAction.Indent);
-		assert.equal(onEnter('<span><span>', 6).indentAction, Modes.IndentAction.Indent);
-		assert.equal(onEnter('<p><span>', 3).indentAction, Modes.IndentAction.Indent);
-		assert.equal(onEnter('<span></span>', 6).indentAction, Modes.IndentAction.IndentOutdent);
-		assert.equal(onEnter('<p></p>', 3).indentAction, Modes.IndentAction.IndentOutdent);
-		assert.equal(onEnter('<span>a</span>', 6).indentAction, Modes.IndentAction.Indent);
-		assert.equal(onEnter('<span>a</span>', 7).indentAction, Modes.IndentAction.IndentOutdent);
-		assert.equal(onEnter('<span> </span>', 6).indentAction, Modes.IndentAction.Indent);
-		assert.equal(onEnter('<span> </span>', 7).indentAction, Modes.IndentAction.IndentOutdent);
+
+		function onEnter(line:string, offset:number): Modes.IEnterAction {
+			let model = new TextModelWithTokens([], TextModel.toRawText(line), false, _mode);
+			let result = getRawEnterActionAtPosition(model, 1, offset + 1);
+			model.dispose();
+			return result;
+		}
+
+		function assertOnEnter(text:string, offset:number, expected: Modes.IndentAction): void {
+			let _actual = onEnter(text, offset);
+			let actual = _actual ? _actual.indentAction : null;
+			let actualStr = actual ? Modes.IndentAction[actual] : null;
+			let expectedStr = expected ? Modes.IndentAction[expected] : null;
+			assert.equal(actualStr, expectedStr, 'TEXT: <<' + text + '>>, OFFSET: <<' + offset + '>>');
+		}
+
+		assertOnEnter('', 0, null);
+		assertOnEnter('>', 1, null);
+		assertOnEnter('span>', 5, null);
+		assertOnEnter('</span>', 7, null);
+		assertOnEnter('<img />', 7, null);
+		assertOnEnter('<span>', 6, Modes.IndentAction.Indent);
+		assertOnEnter('<p>', 3, Modes.IndentAction.Indent);
+		assertOnEnter('<span><span>', 6, Modes.IndentAction.Indent);
+		assertOnEnter('<p><span>', 3, Modes.IndentAction.Indent);
+		assertOnEnter('<span></SPan>', 6, Modes.IndentAction.IndentOutdent);
+		assertOnEnter('<span></span>', 6, Modes.IndentAction.IndentOutdent);
+		assertOnEnter('<p></p>', 3, Modes.IndentAction.IndentOutdent);
+		assertOnEnter('<span>a</span>', 6, Modes.IndentAction.Indent);
+		assertOnEnter('<span>a</span>', 7, Modes.IndentAction.IndentOutdent);
+		assertOnEnter('<span> </span>', 6, Modes.IndentAction.Indent);
+		assertOnEnter('<span> </span>', 7, Modes.IndentAction.IndentOutdent);
 	});
 });
 

src/vs/languages/razor/common/razor.ts

@@ -102,7 +102,19 @@ export class RAZORMode extends htmlMode.HTMLMode<RAZORWorker> {
 					{ open: '"', close: '"' },
 					{ open: '\'', close: '\'' }
 				]
-			}
+			},
+
+			onEnterRules: [
+				{
+					beforeText: new RegExp(`<(?!(?:${htmlMode.EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+					afterText: /^<\/(\w[\w\d]*)\s*>$/i,
+					action: { indentAction: Modes.IndentAction.IndentOutdent }
+				},
+				{
+					beforeText: new RegExp(`<(?!(?:${htmlMode.EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'),
+					action: { indentAction: Modes.IndentAction.Indent }
+				}
+			],
 		});
 	}