From 274bf1134dce7606551a54417f1e62501f36ca3f Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Thu, 6 Feb 2025 19:36:10 +0100 Subject: [PATCH 1/2] Reorder migration results --- packages/cursorless-vscode/src/migrateSnippets.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/cursorless-vscode/src/migrateSnippets.ts b/packages/cursorless-vscode/src/migrateSnippets.ts index fb6e77be98..2f617aa7aa 100644 --- a/packages/cursorless-vscode/src/migrateSnippets.ts +++ b/packages/cursorless-vscode/src/migrateSnippets.ts @@ -181,9 +181,6 @@ async function openResultDocument( `From: ${sourceDirectory}`, `To: ${targetDirectory}`, "", - `## Migrated ${migratedKeys.length} snippet files:`, - ...migratedKeys.map((key) => `- ${key} -> ${result.migrated[key]}`), - "", ]; if (migratedPartiallyKeys.length > 0) { @@ -193,6 +190,7 @@ async function openResultDocument( (key) => `- ${key} -> ${result.migratedPartially[key]}`, ), skipMessage, + "", ); } @@ -201,9 +199,16 @@ async function openResultDocument( `## Skipped ${result.skipped.length} snippet files:`, ...result.skipped.map((key) => `- ${key}`), skipMessage, + "", ); } + content.push( + `## Migrated ${migratedKeys.length} snippet files:`, + ...migratedKeys.map((key) => `- ${key} -> ${result.migrated[key]}`), + "", + ); + const textDocument = await vscode.workspace.openTextDocument({ content: content.join("\n"), language: "markdown", From 09f27b774e72d96cb07502d1b8d67ae32bec9dc6 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Thu, 6 Feb 2025 19:39:48 +0100 Subject: [PATCH 2/2] Reorder --- .../cursorless-vscode/src/migrateSnippets.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/cursorless-vscode/src/migrateSnippets.ts b/packages/cursorless-vscode/src/migrateSnippets.ts index 2f617aa7aa..b4e7f31c90 100644 --- a/packages/cursorless-vscode/src/migrateSnippets.ts +++ b/packages/cursorless-vscode/src/migrateSnippets.ts @@ -183,21 +183,21 @@ async function openResultDocument( "", ]; - if (migratedPartiallyKeys.length > 0) { + if (result.skipped.length > 0) { content.push( - `## Migrated ${migratedPartiallyKeys.length} snippet files partially:`, - ...migratedPartiallyKeys.map( - (key) => `- ${key} -> ${result.migratedPartially[key]}`, - ), + `## Skipped ${result.skipped.length} snippet files:`, + ...result.skipped.map((key) => `- ${key}`), skipMessage, "", ); } - if (result.skipped.length > 0) { + if (migratedPartiallyKeys.length > 0) { content.push( - `## Skipped ${result.skipped.length} snippet files:`, - ...result.skipped.map((key) => `- ${key}`), + `## Migrated ${migratedPartiallyKeys.length} snippet files partially:`, + ...migratedPartiallyKeys.map( + (key) => `- ${key} -> ${result.migratedPartially[key]}`, + ), skipMessage, "", );