From 611302fb1bab2e0ab129411662e925a2bec17f5a Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 4 Feb 2025 20:38:54 +0100 Subject: [PATCH 1/3] Migrate Cursorless formatter names to community --- .../cursorless-vscode/src/migrateSnippets.ts | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/cursorless-vscode/src/migrateSnippets.ts b/packages/cursorless-vscode/src/migrateSnippets.ts index 429b43c4f7..5e90964db2 100644 --- a/packages/cursorless-vscode/src/migrateSnippets.ts +++ b/packages/cursorless-vscode/src/migrateSnippets.ts @@ -140,15 +140,32 @@ function parseVariables( name, wrapperPhrases: phrase ? [phrase] : undefined, wrapperScope: variable.wrapperScopeType, - insertionFormatters: variable.formatter - ? [variable.formatter] - : undefined, + insertionFormatters: getFormatter(variable.formatter), // SKIP: variable.description }; }, ); } +// Convert Cursorless formatters to Talon community formatters +function getFormatter(formatter?: string): string[] | undefined { + if (!formatter) { + return undefined; + } + switch (formatter) { + case "camelCase": + return ["PRIVATE_CAMEL_CASE"]; + case "pascalCase": + return ["PUBLIC_CAMEL_CASE"]; + case "snakeCase": + return ["SNAKE_CASE"]; + case "upperSnakeCase": + return ["ALL_CAPS", "SNAKE_CASE"]; + default: + return [formatter]; + } +} + async function openResultDocument( result: Result, sourceDirectory: string, From 54ea777b5597f162162e58e8fe200ca408143279 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 4 Feb 2025 20:46:34 +0100 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Phil Cohen --- packages/cursorless-vscode/src/migrateSnippets.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/cursorless-vscode/src/migrateSnippets.ts b/packages/cursorless-vscode/src/migrateSnippets.ts index 5e90964db2..c5b5c4e305 100644 --- a/packages/cursorless-vscode/src/migrateSnippets.ts +++ b/packages/cursorless-vscode/src/migrateSnippets.ts @@ -140,7 +140,7 @@ function parseVariables( name, wrapperPhrases: phrase ? [phrase] : undefined, wrapperScope: variable.wrapperScopeType, - insertionFormatters: getFormatter(variable.formatter), + insertionFormatters: formatter ? getFormatter(variable.formatter) : undefined, // SKIP: variable.description }; }, @@ -148,10 +148,7 @@ function parseVariables( } // Convert Cursorless formatters to Talon community formatters -function getFormatter(formatter?: string): string[] | undefined { - if (!formatter) { - return undefined; - } +function getFormatter(formatter: string): string[] { switch (formatter) { case "camelCase": return ["PRIVATE_CAMEL_CASE"]; From bfbfaa785286794fcf40622e05628a843333bdba Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 4 Feb 2025 20:49:21 +0100 Subject: [PATCH 3/3] Name fix --- packages/cursorless-vscode/src/migrateSnippets.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/cursorless-vscode/src/migrateSnippets.ts b/packages/cursorless-vscode/src/migrateSnippets.ts index c5b5c4e305..fb6e77be98 100644 --- a/packages/cursorless-vscode/src/migrateSnippets.ts +++ b/packages/cursorless-vscode/src/migrateSnippets.ts @@ -140,7 +140,9 @@ function parseVariables( name, wrapperPhrases: phrase ? [phrase] : undefined, wrapperScope: variable.wrapperScopeType, - insertionFormatters: formatter ? getFormatter(variable.formatter) : undefined, + insertionFormatters: variable.formatter + ? getFormatter(variable.formatter) + : undefined, // SKIP: variable.description }; },