Improve error handling

Author: RedCMD

README.md

@@ -72,7 +72,6 @@ Highlights scope names with their own themed colour in realtime:
 
 ### Todo
 * Support unicode character insertions `\u00b0`
-* Unify ways of displaying errors
 * Improve performance: [Github Issue - Capturing and applying a pattern causes performance loss](https://github.com/microsoft/vscode-textmate/issues/167)
 * Finish ctrl+click definitions and references
 * Add hovers

src/Providers/CodeActionsProvider.ts

@@ -43,7 +43,7 @@ export const CodeActionsProvider: vscode.CodeActionProvider = {
 					};
 					break;
 				case 'missing':
-					const missing = message.split("'")[3];
+					const missing = message.split("'")[3] || "'";
 
 					edit.insert(document.uri, diagnostic.range.end, missing);
 					codeAction = {

src/tree-sitter/tree-sitter-json/grammar.js

@@ -503,7 +503,7 @@ module.exports = grammar({
 			"true",
 			"false",
 		),
-		null: $ => /null/,
+		null: $ => "null",
 		integer: $ => /-?(0|[1-9]\d*)(\.\d+)?([eE][+-]?\d+)?/,
 		_string: $ => token(
 			prec(-1,
@@ -615,17 +615,13 @@ function pair($, key, value) {
 						),
 				),
 			),
+			$._colon,
+			repeat($._whitespace),
 			optional(
-				seq(
-					$._colon,
-					repeat($._whitespace),
-					optional( // TS bad at error recovery
-						choice(
-							value ?? blank(),
-							prec(-2,
-								$._value,
-							),
-						),
+				choice(
+					value ?? blank(),
+					prec(-2,
+						$._value,
 					),
 				),
 			),