Improve some type checking

Author: RedCMD

src/Providers/CodeActionsProvider.ts

@@ -230,7 +230,7 @@ async function optimizeRegex(edit: vscode.WorkspaceEdit, regexNode: Node, uri: v
 
 	try {
 		if (optimize) {
-			const text = JSON.parse(`"${regexNode.text}"`);
+			const text: string = JSON.parse(`"${regexNode.text}"`);
 
 			const optimized = optimize(text, {
 				rules: {

src/Providers/DocumentFormattingEditProvider.ts

@@ -10,11 +10,11 @@ type formattingStyle = {
 	wsBrackets: string;
 };
 
-function getFormattingStyle(options: vscode.FormattingOptions): formattingStyle {
+function getFormattingStyle(options?: vscode.FormattingOptions): formattingStyle {
 	const bracketStyle = <'tight' | 'default'>vscode.workspace.getConfiguration('json.textmate').get('formattingStyle');
 	const style: formattingStyle = {
-		tabType: options.insertSpaces ? ' ' : '\t',
-		tabSize: options.insertSpaces ? options.tabSize : 1,
+		tabType: options?.insertSpaces ? ' ' : '\t',
+		tabSize: options?.insertSpaces ? options?.tabSize : 1,
 		wsBrackets: bracketStyle == 'tight' ? '' : ' ',
 	};
 	return style;
@@ -75,7 +75,7 @@ export const DocumentRangeFormattingEditProvider: vscode.DocumentRangeFormatting
 
 export const OnTypeFormattingEditProvider: vscode.OnTypeFormattingEditProvider = {
 	async provideOnTypeFormattingEdits(document: vscode.TextDocument, position: vscode.Position, ch: string, options: vscode.FormattingOptions, token: vscode.CancellationToken): Promise<vscode.TextEdit[] | undefined> {
-		// vscode.window.showInformationMessage(JSON.stringify("FormatType"));
+		// vscode.window.showInformationMessage(`FormatType: ${JSON.stringify(ch)}`);
 		// const start = performance.now();
 
 		const trees = getTrees(document);

src/Providers/HoverProvider.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
-import { toRegExpDetails, ToRegExpOptions } from 'oniguruma-to-es';
 import { Point } from 'web-tree-sitter';
+import { toRegExpDetails, ToRegExpOptions } from 'oniguruma-to-es';
 import { getTrees, queryNode, toPoint, toRange, trees } from "../TreeSitter";
 
 export const HoverProvider: vscode.HoverProvider = {

src/TextMate.ts

@@ -161,12 +161,12 @@ function getInjections(scopeName: ScopeName): ScopeName[] | undefined {
 }
 
 
-async function onigLibInterface() {
+async function onigLibInterface(): vscodeTextmate.RegistryOptions['onigLib'] {
 	return {
 		createOnigScanner(sources: string[]): vscodeOniguruma.OnigScanner {
 			return new vscodeOniguruma.OnigScanner(sources);
 		},
-		createOnigString(str: string) {
+		createOnigString(str: string): vscodeOniguruma.OnigString {
 			return new vscodeOniguruma.OnigString(str);
 		}
 	};