Fix console errors

Author: RedCMD

README.md

@@ -84,3 +84,4 @@ Highlights scope names with their own themed colour in realtime:
 * Move to LanguageServer
 * Add unit tests
 * Improve TreeSitter Query performance: [Node contains `&fieldName`](https://github.com/tree-sitter/tree-sitter/issues/3956), [Caching or Serializing a `TSQuery`](https://github.com/tree-sitter/tree-sitter/issues/1942)
+* use strict `null` checks

package-lock.json

@@ -365,7 +365,7 @@
 	},
 	"dependencies": {
 		"vscode-oniguruma": "1.7.0",
-		"web-tree-sitter": "^0.24.4"
+		"web-tree-sitter": "^0.24.3"
 	},
 	"devDependencies": {
 		"@types/vscode": "^1.87.0",

package.json

@@ -115,7 +115,7 @@ function diagnosticsTreeSitterJSONErrors(diagnostics: vscode.Diagnostic[], rootN
 					continue;
 				}
 				diagnostic = {
-					range: toRange(node.previousSibling.endPosition, node.previousSibling.endPosition),
+					range: toRange(node.previousSibling.endPosition),
 					message: `'${parentType}' is missing character${type.length > 1 ? 's' : ''} '${type}'`,
 					severity: vscode.DiagnosticSeverity.Error,
 					source: 'TreeSitter',

src/DiagnosticCollection.ts

@@ -18,6 +18,10 @@ export const HoverProvider: vscode.HoverProvider = {
 			(while (key) @while)
 		`;
 		const hoverCapture = queryNode(rootNode, hoverQuery, point);
+		if (!hoverCapture) {
+			return;
+		}
+
 		const hoverNode = hoverCapture.node;
 
 		const markdownString = new vscode.MarkdownString();
@@ -71,7 +75,7 @@ function debugTreeSitterHovers(trees: trees, point: Point): vscode.Hover {
 	const node = trees.jsonTree.rootNode.descendantForPosition(point);
 	// const node = jsonTree.rootNode.namedDescendantForPosition(point);
 
-	if (node == null) {
+	if (!node) {
 		return;
 	}
 

src/Providers/HoverProvider.ts

@@ -148,13 +148,14 @@ export function queryNode(node: Parser.SyntaxNode, queryString: string, startPoi
 }
 
 export function toRange(node: Parser.SyntaxNode): vscode.Range;
+export function toRange(points: Parser.Point): vscode.Range;
 export function toRange(start: Parser.Point, end: Parser.Point): vscode.Range;
 export function toRange(node: Parser.SyntaxNode | Parser.Point, end?: Parser.Point): vscode.Range {
 	if (!node) {
 		return null;
 	}
 	const startPosition = 'startPosition' in node ? node.startPosition : node;
-	const endPosition = 'startPosition' in node ? node.endPosition : end;
+	const endPosition = 'endPosition' in node ? node.endPosition : end || startPosition;
 	const range = new vscode.Range(
 		startPosition.row,
 		startPosition.column,

src/TreeSitter.ts

@@ -176,7 +176,7 @@ https://www.npmjs.com/package/json-cst
 export async function getPackageJSON(baseUri: vscode.TextDocument | vscode.Uri, ...pathSegments: string[]) {
 	if ('isUntitled' in baseUri) {
 		if (baseUri.isUntitled) {
-			return null;
+			return {};
 		}
 	}
 
@@ -190,7 +190,7 @@ export async function getPackageJSON(baseUri: vscode.TextDocument | vscode.Uri,
 
 	const file = file1 || await vscode.workspace.fs.readFile(packageUri2).then(null, () => { });
 	if (!file) {
-		return null;
+		return {};
 	}
 
 	try {
@@ -205,5 +205,5 @@ export async function getPackageJSON(baseUri: vscode.TextDocument | vscode.Uri,
 		console.warn(`TextMate: Failed to parse package.json\n${error}`);
 	}
 
-	return null;
+	return {};
 }