fixed:generator method of class autocomplete causes star(*) to be added to next line

extensions/typescript-language-features/src/features/languageConfiguration.ts

@@ -33,6 +33,7 @@ const jsTsLanguageConfiguration: vscode.LanguageConfiguration = {
 		}, {
 			// e.g.  * ...|
 			beforeText: /^(\t|[ ])*[ ]\*([ ]([^\*]|\*(?!\/))*)?$/,
+			oneLineAboveText: /^(\s*(\/\*\*|\*)).*/,
 			action: { indentAction: vscode.IndentAction.None, appendText: '* ' }
 		}, {
 			// e.g.  */|

src/vs/editor/common/modes/languageConfiguration.ts

@@ -139,6 +139,10 @@ export interface OnEnterRule {
 	 * This rule will only execute if the text after the cursor matches this regular expression.
 	 */
 	afterText?: RegExp;
+	/**
+	 * This rule will only execute if the text above the this line matches this regular expression.
+	 */
+	oneLineAboveText?: RegExp;
 	/**
 	 * The action to execute.
 	 */

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

@@ -48,17 +48,25 @@ export class OnEnterSupport {
 		// (1): `regExpRules`
 		for (let i = 0, len = this._regExpRules.length; i < len; i++) {
 			let rule = this._regExpRules[i];
-			if (rule.beforeText.test(beforeEnterText)) {
-				if (rule.afterText) {
-					if (rule.afterText.test(afterEnterText)) {
-						return rule.action;
-					}
-				} else {
-					return rule.action;
-				}
+			const regResult = [{
+				reg: rule.beforeText,
+				text: beforeEnterText
+			}, {
+				reg: rule.afterText,
+				text: afterEnterText
+			}, {
+				reg: rule.oneLineAboveText,
+				text: oneLineAboveText
+			}].every((obj): boolean => {
+				return obj.reg ? obj.reg.test(obj.text) : true;
+			});
+
+			if (regResult) {
+				return rule.action;
 			}
 		}
 
+
 		// (2): Special indent-outdent
 		if (beforeEnterText.length > 0 && afterEnterText.length > 0) {
 			for (let i = 0, len = this._brackets.length; i < len; i++) {

src/vs/monaco.d.ts

@@ -4497,6 +4497,10 @@ declare namespace monaco.languages {
 		 * This rule will only execute if the text after the cursor matches this regular expression.
 		 */
 		afterText?: RegExp;
+		/**
+		 * This rule will only execute if the text above the this line matches this regular expression.
+		 */
+		oneLineAboveText?: RegExp;
 		/**
 		 * The action to execute.
 		 */

src/vs/vscode.d.ts

@@ -3578,6 +3578,10 @@ declare module 'vscode' {
 		 * This rule will only execute if the text after the cursor matches this regular expression.
 		 */
 		afterText?: RegExp;
+		/**
+		 * This rule will only execute if the text above the this line matches this regular expression.
+		 */
+		oneLineAboveText?: RegExp;
 		/**
 		 * The action to execute.
 		 */

src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts

@@ -394,6 +394,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		return {
 			beforeText: MainThreadLanguageFeatures._reviveRegExp(onEnterRule.beforeText),
 			afterText: MainThreadLanguageFeatures._reviveRegExp(onEnterRule.afterText),
+			oneLineAboveText: MainThreadLanguageFeatures._reviveRegExp(onEnterRule.oneLineAboveText),
 			action: onEnterRule.action
 		};
 	}

src/vs/workbench/api/node/extHost.protocol.ts

@@ -235,6 +235,7 @@ export interface ISerializedIndentationRule {
 export interface ISerializedOnEnterRule {
 	beforeText: ISerializedRegExp;
 	afterText?: ISerializedRegExp;
+	oneLineAboveText?: ISerializedRegExp;
 	action: EnterAction;
 }
 export interface ISerializedLanguageConfiguration {

src/vs/workbench/api/node/extHostLanguageFeatures.ts

@@ -1216,6 +1216,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return {
 			beforeText: ExtHostLanguageFeatures._serializeRegExp(onEnterRule.beforeText),
 			afterText: ExtHostLanguageFeatures._serializeRegExp(onEnterRule.afterText),
+			oneLineAboveText: ExtHostLanguageFeatures._serializeRegExp(onEnterRule.oneLineAboveText),
 			action: onEnterRule.action
 		};
 	}