Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/commands/runTestFromCodeLens.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { window } from "vscode";

type RunArgs = {
filePath: string,
describe: string | null,
testName?: string,
module?: string
}

export default function runFromCodeLens(args: RunArgs): void {
const elixirLsTerminal =
window.terminals.find(terminal => terminal.name == "ElixirLS") || window.createTerminal("ElixirLS");

elixirLsTerminal.show()
elixirLsTerminal.sendText('clear')
elixirLsTerminal.sendText(buildTestCommand(args));
}

function buildTestCommand(args: RunArgs): string {
const testFilter = buildTestInclude(args.describe, args.testName, args.module)

return `mix test --exclude test --include "${testFilter}" ${args.filePath} --trace`
}

function buildTestInclude(describe: string | null, testName?: string, module?: string) {
if (module) {
return `module:${module}`
}

if (!testName) {
return `describe:${describe}`
}

if (describe) {
return `test:test ${describe} ${testName}`
}

return `test:test ${testName}`
}
3 changes: 3 additions & 0 deletions src/constants/commands.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
RUN_TEST_FROM_CODELENS: 'elixir.lens.test.run'
}
31 changes: 19 additions & 12 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import {
ServerOptions,
} from "vscode-languageclient";
import * as os from "os";
import Commands from "./constants/commands";
import runFromCodeLens from "./commands/runTestFromCodeLens";

export let defaultClient: LanguageClient;
const clients: Map<string, LanguageClient> = new Map();
Expand Down Expand Up @@ -77,16 +79,16 @@ function sortedWorkspaceFolders(): string[] {
if (_sortedWorkspaceFolders === void 0) {
_sortedWorkspaceFolders = workspace.workspaceFolders
? workspace.workspaceFolders
.map((folder) => {
let result = folder.uri.toString();
if (result.charAt(result.length - 1) !== "/") {
result = result + "/";
}
return result;
})
.sort((a, b) => {
return a.length - b.length;
})
.map((folder) => {
let result = folder.uri.toString();
if (result.charAt(result.length - 1) !== "/") {
result = result + "/";
}
return result;
})
.sort((a, b) => {
return a.length - b.length;
})
: [];
}
return _sortedWorkspaceFolders;
Expand Down Expand Up @@ -200,23 +202,28 @@ function configureTerminalLinkProvider(context: ExtensionContext) {
if (!selection) {
return;
}

openUri(selection.uri, line);
});
}
});
}
});

context.subscriptions.push(disposable);
}

function configureRunTestFromCodeLens() {
vscode.commands.registerCommand(Commands.RUN_TEST_FROM_CODELENS, runFromCodeLens);
}

export function activate(context: ExtensionContext): void {
testElixir();
detectConflictingExtension("mjmcloug.vscode-elixir");
// https://github.com/elixir-lsp/vscode-elixir-ls/issues/34
detectConflictingExtension("sammkj.vscode-elixir-formatter");

configureRunTestFromCodeLens()
configureCopyDebugInfo(context);
configureDebugger(context);
configureTerminalLinkProvider(context);
Expand Down