Merge pull request microsoft#136577 from ssigwart/singleLineDeindent

Fix single line if/else and loop indentation for Typescript and PHP

Author: hediet

extensions/cpp/language-configuration.json

@@ -30,5 +30,16 @@
 			"start": "^\\s*#pragma\\s+region\\b",
 			"end": "^\\s*#pragma\\s+endregion\\b"
 		}
-	}
+	},
+	"onEnterRules": [
+		{
+			// Decrease indentation after single line if/else if/else, for, or while
+			"previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$",
+			// But make sure line doesn't have braces or is not another if statement
+			"beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
+			"action": {
+				"indent": "outdent"
+			}
+		}
+	]
 }

extensions/javascript/javascript-language-configuration.json

@@ -188,6 +188,15 @@
 			"action": {
 				"indent": "indent"
 			}
+		},
+		{
+			// Decrease indentation after single line if/else if/else, for, or while
+			"previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$",
+			// But make sure line doesn't have braces or is not another if statement
+			"beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
+			"action": {
+				"indent": "outdent"
+			}
 		}
 	]
 }

extensions/php/language-configuration.json

@@ -76,6 +76,15 @@
 				"indent": "none",
 				"removeText": 1
 			}
+		},
+		{
+			// Decrease indentation after single line if/else if/else, for, foreach, or while
+			"previousLineText": "^\\s*(((else ?)?if|for(each)?|while)\\s*\\(.*\\)\\s*|else\\s*)$",
+			// But make sure line doesn't have braces or is not another if statement
+			"beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
+			"action": {
+				"indent": "outdent"
+			}
 		}
 	]
 }

extensions/typescript-basics/language-configuration.json

@@ -206,6 +206,15 @@
 			"action": {
 				"indent": "indent"
 			}
+		},
+		{
+			// Decrease indentation after single line if/else if/else, for, or while
+			"previousLineText": "^\\s*(((else ?)?if|for|while)\\s*\\(.*\\)\\s*|else\\s*)$",
+			// But make sure line doesn't have braces or is not another if statement
+			"beforeText": "^\\s+([^{i\\s]|i(?!f\\b))",
+			"action": {
+				"indent": "outdent"
+			}
 		}
 	]
 }