Organize imports across Astro frontmatter and scripts

.changeset/perky-clowns-pay.md

@@ -0,0 +1,5 @@
+---
+'astro-vscode': patch
+---
+
+Fixes organize imports across frontmatter and multiple script tags

packages/language-tools/language-server/test/typescript/organize-imports.test.ts

@@ -130,4 +130,50 @@ describe('TypeScript - Organize & Sort Imports', () => {
 
 		assert.ok(returnedText.some((text) => text.includes('helperOne, helperTwo')));
 	});
+
+	it('organizes imports in every TypeScript region for full-document actions', async () => {
+		const document = await languageServer.openFakeDocument(
+			`---
+import { serverTwo, serverOne } from './server';
+
+serverOne();
+serverTwo();
+---
+
+<script>
+	import { clientTwo, clientOne } from './client';
+
+	clientOne();
+	clientTwo();
+</script>
+
+<script>
+	import { otherTwo, otherOne } from './other';
+
+	otherOne();
+	otherTwo();
+</script>
+`,
+			'astro',
+		);
+		const organizeActions = await languageServer.handle.sendCodeActionsRequest(
+			document.uri,
+			Range.create(0, 0, document.lineCount - 1, 0),
+			{
+				diagnostics: [],
+				only: ['source.organizeImports'],
+				triggerKind: 2,
+			},
+		);
+		const organizeEdits = await Promise.all(
+			(organizeActions as CodeAction[]).map((action) =>
+				languageServer.handle.sendCodeActionResolveRequest(action),
+			),
+		);
+		const returnedText = getTextEdits(organizeEdits).map((edit) => edit.newText);
+
+		assert.ok(returnedText.some((text) => text.includes('serverOne, serverTwo')));
+		assert.ok(returnedText.some((text) => text.includes('clientOne, clientTwo')));
+		assert.ok(returnedText.some((text) => text.includes('otherOne, otherTwo')));
+	});
 });

patches/@volar__language-service@2.4.28.patch

@@ -0,0 +1,11 @@
+diff --git a/lib/utils/dedupe.js b/lib/utils/dedupe.js
+--- a/lib/utils/dedupe.js
++++ b/lib/utils/dedupe.js
+@@ -39,6 +39,7 @@ function createLocationSet() {
+ function withCodeAction(items) {
+     return dedupe(items, item => [
+         item.title,
++        JSON.stringify(item.data),
+     ].join(':'));
+ }
+ function withTextEdits(items) {

pnpm-workspace.yaml

@@ -113,4 +113,5 @@ allowBuilds:
   workerd: false
 
 patchedDependencies:
+  '@volar/language-service@2.4.28': patches/@volar__language-service@2.4.28.patch
   '@volar/typescript@2.4.28': patches/@volar__typescript@2.4.28.patch