Fixes #4065: Catch the copyright case in the onEnterRules

extensions/typescript/src/typescriptMain.ts

@@ -180,6 +180,11 @@ class LanguageProvider {
 						// e.g.  */|
 						beforeText: /^(\t|(\ \ ))*\ \*\/\s*$/,
 						action: { indentAction: IndentAction.None, removeText: 1 }
+					},
+					{
+						// e.g.  *-----*/|
+						beforeText: /^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$/,
+						action: { indentAction: IndentAction.None, removeText: 1 }
 					}
 				],
 

src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts

@@ -48,6 +48,11 @@ class MockJSMode extends MockTokenizingMode {
 					// e.g.  */|
 					beforeText: /^(\t|(\ \ ))*\ \*\/\s*$/,
 					action: { indentAction: IndentAction.None, removeText: 1 }
+				},
+				{
+					// e.g.  *-----*/|
+					beforeText: /^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$/,
+					action: { indentAction: IndentAction.None, removeText: 1 }
 				}
 			]
 		});

src/vs/editor/test/common/commands/shiftCommand.test.ts

@@ -64,6 +64,11 @@ class DocBlockCommentMode extends MockMode {
 					// e.g.  */|
 					beforeText: /^(\t|(\ \ ))*\ \*\/\s*$/,
 					action: { indentAction: IndentAction.None, removeText: 1 }
+				},
+				{
+					// e.g.  *-----*/|
+					beforeText: /^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$/,
+					action: { indentAction: IndentAction.None, removeText: 1 }
 				}
 			]
 		});

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

@@ -93,6 +93,10 @@ suite('OnEnter', () => {
 				{
 					beforeText: /^(\t|(\ \ ))*\ \*\/\s*$/,
 					action: { indentAction: IndentAction.None, removeText: 1 }
+				},
+				{
+					beforeText: /^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$/,
+					action: { indentAction: IndentAction.None, removeText: 1 }
 				}
 			]
 		});
@@ -131,7 +135,7 @@ suite('OnEnter', () => {
 		testIndentAction('\t*', '', null, null);
 		testIndentAction('\t *', '', IndentAction.None, '* ');
 		testIndentAction('\t */', '', IndentAction.None, null, 1);
-		testIndentAction('\t * */', '', null, null);
+		testIndentAction('\t * */', '', IndentAction.None, null, 1);
 		testIndentAction('\t * * / * / * / */', '', null, null);
 		testIndentAction('\t * ', '', IndentAction.None, '* ');
 		testIndentAction(' * ', '', IndentAction.None, '* ');
@@ -146,5 +150,6 @@ suite('OnEnter', () => {
 		testIndentAction('   */', '', IndentAction.None, null, 1);
 		testIndentAction('     */', '', IndentAction.None, null, 1);
 		testIndentAction('\t     */', '', IndentAction.None, null, 1);
+		testIndentAction(' *--------------------------------------------------------------------------------------------*/', '', IndentAction.None, null, 1);
 	});
 });
\ No newline at end of file

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

@@ -60,6 +60,11 @@ class MockJSMode extends MockTokenizingMode {
 					// e.g.  */|
 					beforeText: /^(\t|(\ \ ))*\ \*\/\s*$/,
 					action: { indentAction: Modes.IndentAction.None, removeText: 1 }
+				},
+				{
+					// e.g.  *-----*/|
+					beforeText: /^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$/,
+					action: { indentAction: Modes.IndentAction.None, removeText: 1 }
 				}
 			]
 		});

src/vs/languages/typescript/common/mode.ts

@@ -73,6 +73,11 @@ const richEditConfiguration:IRichEditConfiguration = {
 			// e.g.  */|
 			beforeText: /^(\t|(\ \ ))*\ \*\/\s*$/,
 			action: { indentAction: modes.IndentAction.None, removeText: 1 }
+		},
+		{
+			// e.g.  *-----*/|
+			beforeText: /^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$/,
+			action: { indentAction: modes.IndentAction.None, removeText: 1 }
 		}
 	],