Remove some differences from us and vscode (#6421)

* remove some differences from us and vscode

* readd temp-write tpyings

extensions/python/syntaxes/MagicPython.tmLanguage.json

@@ -97,7 +97,8 @@
 		},
 		"docstring-statement": {
 			"begin": "^(?=\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
-			"end": "(?<=\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\")",
+			"comment": "the string either terminates correctly or by the beginning of a new line (this is for single line docstrings that aren't terminated) AND it's not followed by another docstring",
+			"end": "((?<=\\1)|^)(?!\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
 			"patterns": [
 				{
 					"include": "#docstring"
@@ -164,7 +165,7 @@
 				{
 					"name": "string.quoted.docstring.single.python",
 					"begin": "(\\'|\\\")",
-					"end": "(\\1)|((?<!\\\\)\\n)",
+					"end": "(\\1)|(\\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.string.begin.python"
@@ -190,7 +191,7 @@
 				{
 					"name": "string.quoted.docstring.raw.single.python",
 					"begin": "([rR])(\\'|\\\")",
-					"end": "(\\2)|((?<!\\\\)\\n)",
+					"end": "(\\2)|(\\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.type.string.python"
@@ -871,11 +872,14 @@
 					"name": "meta.format.brace.python",
 					"match": "(?x)\n  (\n    {{ | }}\n    | (?:\n      {\n        \\w* (\\.[[:alpha:]_]\\w* | \\[[^\\]'\"]+\\])*\n        (![rsa])?\n        ( : \\w? [<>=^]? [-+ ]? \\#?\n          \\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )?\n      })\n  )\n",
 					"captures": {
-						"2": {
-							"name": "storage.type.format.python"
+						"1": {
+							"name": "constant.character.format.placeholder.other.python"
 						},
 						"3": {
 							"name": "storage.type.format.python"
+						},
+						"4": {
+							"name": "storage.type.format.python"
 						}
 					}
 				},
@@ -889,15 +893,10 @@
 						"3": {
 							"name": "storage.type.format.python"
 						},
-						"3": {
+						"4": {
 							"name": "storage.type.format.python"
 						}
-					},
-					"patterns": [
-						{
-							"match": "(?x) \\{ [^'\"}\\n]*? \\} (?=.*?\\})\n"
-						}
-					]
+					}
 				}
 			]
 		},
@@ -4585,7 +4584,7 @@
 		},
 		"string-quoted-single-line": {
 			"name": "string.quoted.single.python",
-			"begin": "(\\b[rR](?=[uU]))?([uU])?((['\"]))",
+			"begin": "(?:\\b([rR])(?=[uU]))?([uU])?((['\"]))",
 			"end": "(\\3)|((?<!\\\\)\\n)",
 			"beginCaptures": {
 				"1": {
@@ -4759,7 +4758,7 @@
 		},
 		"string-quoted-multi-line": {
 			"name": "string.quoted.multi.python",
-			"begin": "(\\b[rR](?=[uU]))?([uU])?('''|\"\"\")",
+			"begin": "(?:\\b([rR])(?=[uU]))?([uU])?('''|\"\"\")",
 			"end": "(\\3)",
 			"beginCaptures": {
 				"1": {