Skip to content
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.

Sign up for GitHub

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

Remove Expand Macro Test #1324

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Remove Expand Macro Test #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 0 additions & 42 deletions assets/test/swift-macro/Package.swift
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions assets/test/swift-macro/Sources/swift-macro/swift_macro.swift
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions assets/test/swift-macro/Sources/swift-macroClient/main.swift
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions assets/test/swift-macro/Sources/swift-macroMacros/swift_macroMacro.swift
View file
Open in desktop

This file was deleted.

79 changes: 2 additions & 77 deletions test/integration-tests/language/LanguageClientIntegration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ import { WorkspaceContext } from "../../../src/WorkspaceContext";
import { testAssetUri } from "../../fixtures";
import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilities/tasks";
import { getBuildAllTask, SwiftTask } from "../../../src/tasks/SwiftTaskProvider";
import { Version } from "../../../src/utilities/version";
import { activateExtensionForSuite, folderInRootWorkspace } from "../utilities/testutilities";
import { FolderContext } from "../../../src/FolderContext";
import { waitForClientState, waitForCodeActions, waitForIndex } from "../utilities/lsputilities";
import { waitForClientState, waitForIndex } from "../utilities/lsputilities";

async function buildProject(ctx: WorkspaceContext, name: string) {
await waitForNoRunningTasks();
Expand All @@ -35,20 +33,15 @@ async function buildProject(ctx: WorkspaceContext, name: string) {
}

suite("Language Client Integration Suite @slow", function () {
this.timeout(5 * 60 * 1000);
this.timeout(2 * 60 * 1000);

let clientManager: LanguageClientManager;
let workspaceContext: WorkspaceContext;
let macroFolderContext: FolderContext;

activateExtensionForSuite({
async setup(ctx) {
workspaceContext = ctx;

// Wait for a clean starting point, and build all tasks for the fixture
if (workspaceContext.swiftVersion.isGreaterThanOrEqual(new Version(6, 1, 0))) {
macroFolderContext = await buildProject(ctx, "swift-macro");
}
await buildProject(ctx, "defaultPackage");

// Ensure lsp client is ready
Expand All @@ -61,74 +54,6 @@ suite("Language Client Integration Suite @slow", function () {
await waitForIndex(workspaceContext.languageClientManager);
});

test("Expand Macro", async function () {
// Expand Macro support in Swift started from 6.1
if (workspaceContext.swiftVersion.isLessThan(new Version(6, 1, 0))) {
this.skip();
}

// Focus on the file of interest
const uri = testAssetUri("swift-macro/Sources/swift-macroClient/main.swift");
await vscode.window.showTextDocument(uri);
await workspaceContext.focusFolder(macroFolderContext);

// Beginning of macro, #
const position = new vscode.Position(5, 21);

// Create a range starting and ending at the specified position
const range = new vscode.Selection(position, position.with({ character: 22 }));

await waitForCodeActions(workspaceContext.languageClientManager, uri, range);

// Execute the code action provider command
const codeActions = await vscode.commands.executeCommand<vscode.CodeAction[]>(
"vscode.executeCodeActionProvider",
uri,
range
);

// Find the "expand.macro.command" action
const expandMacroAction = codeActions.find(
action => action.command?.command === "expand.macro.command"
);

// Assert that the expand macro command is available
expect(expandMacroAction).is.not.undefined;

// Set up a promise that resolves when the expected document is opened
const expandedMacroUriPromise = new Promise<vscode.TextDocument>((resolve, reject) => {
const disposable = vscode.workspace.onDidOpenTextDocument(openedDocument => {
if (openedDocument.uri.scheme === "sourcekit-lsp") {
disposable.dispose(); // Stop listening once we find the desired document
resolve(openedDocument);
}
});

// Set a timeout to reject the promise if the document is not found
setTimeout(() => {
disposable.dispose();
reject(new Error("Timed out waiting for sourcekit-lsp document to be opened."));
}, 10000); // Wait up to 10 seconds for the document
});

// Run expand macro action
const command = expandMacroAction!.command!;
expect(command.arguments).is.not.undefined;
const commandArgs = command.arguments!;
await vscode.commands.executeCommand(command.command, ...commandArgs);

// Wait for the expanded macro document to be opened
const referenceDocument = await expandedMacroUriPromise;

// Verify that the reference document was successfully opened
expect(referenceDocument).to.not.be.undefined;

// Assert that the content contains the expected result
const expectedMacro = '(a + b, "a + b")';
const content = referenceDocument.getText();
expect(content).to.include(expectedMacro);
});

suite("Symbols", () => {
const uri = testAssetUri("defaultPackage/Sources/PackageExe/main.swift");
const expectedDefinitionUri = testAssetUri(
Expand Down
Loading