Skip to content

Bulk scope test recorder #2383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions cursorless-talon-dev/src/cursorless_dev.talon
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ tag: user.cursorless
user.run_rpc_command("cursorless.recordTestCase")
{user.cursorless_homophone} record one:
user.run_rpc_command("cursorless.recordOneTestCaseThenPause")
{user.cursorless_homophone} record scope:
user.run_rpc_command("cursorless.recordScopeTests.showUnimplementedFacets")
{user.cursorless_homophone} save scope:
user.run_rpc_command("cursorless.recordScopeTests.saveActiveDocument")
{user.cursorless_homophone} pause:
user.run_rpc_command("cursorless.pauseRecording")
{user.cursorless_homophone} resume:
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/cursorlessCommandIds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export const cursorlessCommandIds = [
"cursorless.recordTestCase",
"cursorless.recordOneTestCaseThenPause",
"cursorless.resumeRecording",
"cursorless.recordScopeTests.showUnimplementedFacets",
"cursorless.recordScopeTests.saveActiveDocument",
"cursorless.showCheatsheet",
"cursorless.showDocumentation",
"cursorless.showQuickPick",
Expand Down Expand Up @@ -70,6 +72,12 @@ export const cursorlessCommandDescriptions: Record<
["cursorless.resumeRecording"]: new VisibleCommand(
"Resume test case recording",
),
["cursorless.recordScopeTests.showUnimplementedFacets"]: new VisibleCommand(
"Bulk record unimplemented scope facets",
),
["cursorless.recordScopeTests.saveActiveDocument"]: new VisibleCommand(
"Bulk save scope tests for the active document",
),
["cursorless.showDocumentation"]: new VisibleCommand("Show documentation"),
["cursorless.showScopeVisualizer"]: new VisibleCommand(
"Show the scope visualizer",
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export * from "./testUtil/shouldUpdateFixtures";
export * from "./testUtil/TestCaseSnapshot";
export * from "./testUtil/serializeTestFixture";
export * from "./testUtil/asyncSafety";
export * from "./testUtil/getScopeTestPathsRecursively";
export * from "./util/typeUtils";
export * from "./ide/types/hatStyles.types";
export * from "./errors";
Expand Down
65 changes: 32 additions & 33 deletions packages/common/src/scopeSupportFacets/languageScopeSupport.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { StringRecord } from "../types/StringRecord";
import { cScopeSupport } from "./c";
import { clojureScopeSupport } from "./clojure";
import { cppScopeSupport } from "./cpp";
Expand Down Expand Up @@ -27,36 +28,34 @@ import { typescriptreactScopeSupport } from "./typescriptreact";
import { xmlScopeSupport } from "./xml";
import { yamlScopeSupport } from "./yaml";

export const languageScopeSupport: Record<
string,
LanguageScopeSupportFacetMap
> = {
c: cScopeSupport,
clojure: clojureScopeSupport,
cpp: cppScopeSupport,
csharp: csharpScopeSupport,
css: cssScopeSupport,
go: goScopeSupport,
html: htmlScopeSupport,
java: javaScopeSupport,
javascript: javascriptScopeSupport,
javascriptreact: javascriptScopeSupport,
json: jsonScopeSupport,
jsonc: jsoncScopeSupport,
jsonl: jsonlScopeSupport,
latex: latexScopeSupport,
lua: luaScopeSupport,
markdown: markdownScopeSupport,
php: phpScopeSupport,
python: pythonScopeSupport,
ruby: rubyScopeSupport,
rust: rustScopeSupport,
scala: scalaScopeSupport,
scm: scmScopeSupport,
scss: scssScopeSupport,
talon: talonScopeSupport,
typescript: typescriptScopeSupport,
typescriptreact: typescriptreactScopeSupport,
xml: xmlScopeSupport,
yaml: yamlScopeSupport,
};
export const languageScopeSupport: StringRecord<LanguageScopeSupportFacetMap> =
{
c: cScopeSupport,
clojure: clojureScopeSupport,
cpp: cppScopeSupport,
csharp: csharpScopeSupport,
css: cssScopeSupport,
go: goScopeSupport,
html: htmlScopeSupport,
java: javaScopeSupport,
javascript: javascriptScopeSupport,
javascriptreact: javascriptScopeSupport,
json: jsonScopeSupport,
jsonc: jsoncScopeSupport,
jsonl: jsonlScopeSupport,
latex: latexScopeSupport,
lua: luaScopeSupport,
markdown: markdownScopeSupport,
php: phpScopeSupport,
python: pythonScopeSupport,
ruby: rubyScopeSupport,
rust: rustScopeSupport,
scala: scalaScopeSupport,
scm: scmScopeSupport,
scss: scssScopeSupport,
talon: talonScopeSupport,
typescript: typescriptScopeSupport,
typescriptreact: typescriptreactScopeSupport,
xml: xmlScopeSupport,
yaml: yamlScopeSupport,
};
101 changes: 101 additions & 0 deletions packages/common/src/testUtil/getScopeTestPathsRecursively.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import { readFileSync } from "node:fs";
import { groupBy, type Dictionary } from "lodash";
import {
getScopeTestConfigPaths,
getScopeTestPaths,
type ScopeTestPath,
} from "./getFixturePaths";

export interface ScopeTestConfig {
imports?: string[];
skip?: boolean;
}

export function getScopeTestPathsRecursively(): ScopeTestPath[] {
const configPaths = getScopeTestConfigPaths();
const configs = readConfigFiles(configPaths);
const testPathsRaw = getScopeTestPaths();
const languagesRaw = groupBy(testPathsRaw, (test) => test.languageId);
const result: ScopeTestPath[] = [];

// Languages without any tests still needs to be included in case they have an import
for (const languageId of Object.keys(configs)) {
if (!languagesRaw[languageId]) {
languagesRaw[languageId] = [];
}
}

for (const languageId of Object.keys(languagesRaw)) {
const config = configs[languageId];

// This 'language' only exists to be imported by other
if (config?.skip) {
continue;
}

const testPathsForLanguage: ScopeTestPath[] = [];
addTestPathsForLanguageRecursively(
languagesRaw,
configs,
testPathsForLanguage,
new Set(),
languageId,
);
for (const test of testPathsForLanguage) {
const name =
languageId === test.languageId
? test.name
: `${test.name.replace(`/${test.languageId}/`, `/${languageId}/`)} (${test.languageId})`;
result.push({
...test,
languageId,
name,
});
}
}

return result;
}

function addTestPathsForLanguageRecursively(
languages: Dictionary<ScopeTestPath[]>,
configs: Record<string, ScopeTestConfig | undefined>,
result: ScopeTestPath[],
usedLanguageIds: Set<string>,
languageId: string,
): void {
if (usedLanguageIds.has(languageId)) {
return;
}

if (!languages[languageId]) {
throw Error(`No test paths found for language ${languageId}`);
}

result.push(...languages[languageId]);
usedLanguageIds.add(languageId);

const config = configs[languageId];
const importLanguageIds = config?.imports ?? [];

for (const langImport of importLanguageIds) {
addTestPathsForLanguageRecursively(
languages,
configs,
result,
usedLanguageIds,
langImport,
);
}
}

function readConfigFiles(
configPaths: { languageId: string; path: string }[],
): Record<string, ScopeTestConfig> {
const result: Record<string, ScopeTestConfig> = {};
for (const p of configPaths) {
const content = readFileSync(p.path, "utf8");
result[p.languageId] = JSON.parse(content) as ScopeTestConfig;
}
return result;
}
1 change: 1 addition & 0 deletions packages/common/src/types/StringRecord.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export type StringRecord<T> = Partial<Record<string, T>>;
138 changes: 138 additions & 0 deletions packages/cursorless-engine/src/ScopeTestRecorder.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
import {
ScopeSupportFacetLevel,
getScopeTestPathsRecursively,
getScopeTestsDirPath,
groupBy,
languageScopeSupport,
scopeSupportFacetInfos,
showInfo,
type IDE,
type ScopeSupportFacet,
} from "@cursorless/common";
import * as fs from "node:fs";
import * as fsPromises from "node:fs/promises";
import * as path from "node:path";

export class ScopeTestRecorder {
constructor(private ide: IDE) {
this.showUnimplementedFacets = this.showUnimplementedFacets.bind(this);
this.saveActiveDocument = this.saveActiveDocument.bind(this);
}

async showUnimplementedFacets() {
const languageId = await this.languageSelection();

if (languageId == null) {
return;
}

const supportedScopeFacets = getSupportedScopeFacets(languageId);
const existingScopeTestFacets = getExistingScopeFacetTest(languageId);

const missingScopeFacets = supportedScopeFacets.filter(
(facet) => !existingScopeTestFacets.has(facet),
);

let currentSnippetPlaceholder = 1;
const missingScopeFacetRows = missingScopeFacets.map(
(facet) =>
`[${facet}] - ${scopeSupportFacetInfos[facet].description}\n$${currentSnippetPlaceholder++}\n---\n`,
);
const header = `[[${languageId}]]\n\n`;
const snippetText = `${header}${missingScopeFacetRows.join("\n")}`;

const editor = await this.ide.openUntitledTextDocument({
language: "markdown",
});

const editableEditor = this.ide.getEditableTextEditor(editor);
await editableEditor.insertSnippet(snippetText);
}

async saveActiveDocument() {
const text = this.ide.activeTextEditor?.document.getText() ?? "";
const matchLanguageId = text.match(/^\[\[(\w+)\]\]\n/);

if (matchLanguageId == null) {
throw Error(`Can't match language id`);
}

const languageId = matchLanguageId[1];
const restText = text.slice(matchLanguageId[0].length);

const parts = restText
.split(/^---$/gm)
.map((p) => p.trimStart())
.filter(Boolean);

const facetsToAdd: { facet: string; content: string }[] = [];

for (const part of parts) {
const match = part.match(/^\[([\w.]+)\].*\n([\s\S]*)$/);
const facet = match?.[1];
const content = match?.[2] ?? "";

if (facet == null) {
throw Error(`Invalid pattern '${part}'`);
}

if (!content.trim()) {
continue;
}

facetsToAdd.push({ facet, content });
}

const langDirectory = path.join(getScopeTestsDirPath(), languageId);

await fsPromises.mkdir(langDirectory, { recursive: true });

for (const { facet, content } of facetsToAdd) {
const fullContent = `${content}---\n`;
let filePath = path.join(langDirectory, `${facet}.scope`);
let i = 2;

while (fs.existsSync(filePath)) {
filePath = path.join(langDirectory, `${facet}${i++}.scope`);
}

await fsPromises.writeFile(filePath, fullContent, "utf-8");
}

await showInfo(
this.ide.messages,
"scopeTestsSaved",
`${facetsToAdd.length} scope tests saved for language '${languageId}`,
);
}

private languageSelection() {
const languageIds = Object.keys(languageScopeSupport);
languageIds.sort();
return this.ide.showQuickPick(languageIds, {
title: "Select language to record scope tests for",
});
}
}

function getSupportedScopeFacets(languageId: string): ScopeSupportFacet[] {
const scopeSupport = languageScopeSupport[languageId];

if (scopeSupport == null) {
throw Error(`Missing scope support for language '${languageId}'`);
}

const scopeFacets = Object.keys(scopeSupport) as ScopeSupportFacet[];

return scopeFacets.filter(
(facet) => scopeSupport[facet] === ScopeSupportFacetLevel.supported,
);
}

function getExistingScopeFacetTest(languageId: string): Set<string> {
const testPaths = getScopeTestPathsRecursively();
const languages = groupBy(testPaths, (test) => test.languageId);
const testPathsForLanguage = languages.get(languageId) ?? [];
const facets = testPathsForLanguage.map((test) => test.facet);
return new Set(facets);
}
1 change: 1 addition & 0 deletions packages/cursorless-engine/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ export * from "./CommandRunner";
export * from "./CommandHistory";
export * from "./CommandHistoryAnalyzer";
export * from "./util/grammarHelpers";
export * from "./ScopeTestRecorder";
Loading
Loading