Merge pull request #10 from visualfc/test

test: support gop
goplus · Oct 22, 2023 · 9187d06 · 9187d06
2 parents 8bee5c1 + fa9c7fc
commit 9187d06
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/src/goBuild.ts b/src/goBuild.ts
@@ -106,7 +106,7 @@ export async function goBuild(
 
 	const buildEnv = toolExecutionEnvironment();
 	const tmpPath = getTempFilePath('go-code-check');
-	const isTestFile = fileUri && fileUri.fsPath.endsWith('_test.go');
+	const isTestFile = fileUri && (fileUri.fsPath.endsWith('_test.go') || fileUri.fsPath.endsWith('_test.gop'));
 	const buildFlags: string[] = isTestFile
 		? getTestFlags(goConfig)
 		: Array.isArray(goConfig['buildFlags'])

diff --git a/src/goDebugConfiguration.ts b/src/goDebugConfiguration.ts
@@ -323,10 +323,14 @@ export class GoDebugConfigurationProvider implements vscode.DebugConfigurationPr
 				// file path instead of the currently active file.
 				filename = debugConfiguration['program'];
 			}
-			debugConfiguration['mode'] = filename?.endsWith('_test.go') ? 'test' : 'debug';
+			debugConfiguration['mode'] =
+				filename?.endsWith('_test.go') || filename?.endsWith('_test.gop') ? 'test' : 'debug';
 		}
 
-		if (debugConfiguration['mode'] === 'test' && debugConfiguration['program'].endsWith('_test.go')) {
+		if (
+			debugConfiguration['mode'] === 'test' &&
+			(debugConfiguration['program'].endsWith('_test.go') || debugConfiguration['program'].endsWith('_test.gop'))
+		) {
 			// Running a test file in file mode does not make sense, so change the program
 			// to the directory.
 			debugConfiguration['program'] = path.dirname(debugConfiguration['program']);

diff --git a/src/goMode.ts b/src/goMode.ts
@@ -26,3 +26,13 @@ export function isGoFile(document: vscode.TextDocument): boolean {
 	}
 	return false;
 }
+
+export const GOP_MODE: Filter = { language: 'gop', scheme: 'file' };
+export const GOP_MOD_MODE: Filter = { language: 'gop.mod', scheme: 'file' };
+
+export function isGopFile(document: vscode.TextDocument): boolean {
+	if (vscode.languages.match(GOP_MODE, document) || vscode.languages.match(GOP_MOD_MODE, document)) {
+		return true;
+	}
+	return false;
+}
diff --git a/src/goRunTestCodelens.ts b/src/goRunTestCodelens.ts
@@ -14,15 +14,16 @@ import { GoBaseCodeLensProvider } from './goBaseCodelens';
 import { GoDocumentSymbolProvider } from './goDocumentSymbols';
 import { getBenchmarkFunctions, getTestFunctions } from './testUtils';
 import { GoExtensionContext } from './context';
-import { GO_MODE } from './goMode';
+import { GO_MODE, GOP_MODE } from './goMode';
 
 export class GoRunTestCodeLensProvider extends GoBaseCodeLensProvider {
 	static activate(ctx: vscode.ExtensionContext, goCtx: GoExtensionContext) {
 		const testCodeLensProvider = new this(goCtx);
 		ctx.subscriptions.push(vscode.languages.registerCodeLensProvider(GO_MODE, testCodeLensProvider));
+		ctx.subscriptions.push(vscode.languages.registerCodeLensProvider(GOP_MODE, testCodeLensProvider));
 		ctx.subscriptions.push(
 			vscode.workspace.onDidChangeConfiguration(async (e: vscode.ConfigurationChangeEvent) => {
-				if (!e.affectsConfiguration('go')) {
+				if (!e.affectsConfiguration('go') && !e.affectsConfiguration('gop')) {
 					return;
 				}
 				const updatedGoConfig = getGoConfig();
@@ -46,7 +47,7 @@ export class GoRunTestCodeLensProvider extends GoBaseCodeLensProvider {
 		const config = getGoConfig(document.uri);
 		const codeLensConfig = config.get<{ [key: string]: any }>('enableCodeLens');
 		const codelensEnabled = codeLensConfig ? codeLensConfig['runtest'] : false;
-		if (!codelensEnabled || !document.fileName.endsWith('_test.go')) {
+		if (!codelensEnabled || (!document.fileName.endsWith('_test.go') && !document.fileName.endsWith('_test.gop'))) {
 			return [];
 		}
 

diff --git a/src/goTest.ts b/src/goTest.ts
@@ -48,7 +48,7 @@ async function _testAtCursor(
 	if (!editor) {
 		throw new NotFoundError('No editor is active.');
 	}
-	if (!editor.document.fileName.endsWith('_test.go')) {
+	if (!editor.document.fileName.endsWith('_test.go') && !editor.document.fileName.endsWith('_test.gop')) {
 		throw new NotFoundError('No tests found. Current file is not a test file.');
 	}
 
@@ -86,7 +86,7 @@ async function _subTestAtCursor(
 		vscode.window.showInformationMessage('No editor is active.');
 		return;
 	}
-	if (!editor.document.fileName.endsWith('_test.go')) {
+	if (!editor.document.fileName.endsWith('_test.go') && !editor.document.fileName.endsWith('_test.gop')) {
 		vscode.window.showInformationMessage('No tests found. Current file is not a test file.');
 		return;
 	}
@@ -377,7 +377,7 @@ export function testCurrentFile(isBenchmark: boolean, getConfig = getGoConfig):
 			vscode.window.showInformationMessage('No editor is active.');
 			return false;
 		}
-		if (!editor.document.fileName.endsWith('_test.go')) {
+		if (!editor.document.fileName.endsWith('_test.go') && !editor.document.fileName.endsWith('_test.gop')) {
 			vscode.window.showInformationMessage('No tests found. Current file is not a test file.');
 			return false;
 		}