Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

2026-02-16 10:58:30 -05:00 · 2019-08-12 21:31:51 -07:00
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions
--- a/extensions/json-language-features/client/src/jsonMain.ts
+++ b/extensions/json-language-features/client/src/jsonMain.ts
@@ -223,7 +223,7 @@ export function activate(context: ExtensionContext) {
 	let languageConfiguration: LanguageConfiguration = {
 		wordPattern: /("(?:[^\\\"]*(?:\\.)?)*"?)|[^\s{}\[\],:]+/,
 		indentationRules: {
-			increaseIndentPattern: /^.*(\{[^}]*|\[[^\]]*)$/,
+			increaseIndentPattern: /({+(?=([^"]*"[^"]*")*[^"}]*$))|(\[+(?=([^"]*"[^"]*")*[^"\]]*$))/,
 			decreaseIndentPattern: /^\s*[}\]],?\s*$/
 		}
 	};