Skip to content
Closed
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
48 changes: 0 additions & 48 deletions assets/test/targets/Package.swift

This file was deleted.

9 changes: 0 additions & 9 deletions assets/test/targets/Plugins/PluginTarget/main.swift

This file was deleted.

1 change: 0 additions & 1 deletion assets/test/targets/Snippets/AnotherSnippet.swift

This file was deleted.

1 change: 0 additions & 1 deletion assets/test/targets/Snippets/Snippet.swift

This file was deleted.

Empty file.
1 change: 0 additions & 1 deletion assets/test/targets/Sources/ExecutableTarget/main.swift

This file was deleted.

9 changes: 0 additions & 9 deletions assets/test/targets/Sources/LibraryTarget/Targets.swift

This file was deleted.

8 changes: 0 additions & 8 deletions assets/test/targets/Tests/AnotherTests/AnotherTests.swift

This file was deleted.

8 changes: 0 additions & 8 deletions assets/test/targets/Tests/TargetsTests/TargetsTests.swift

This file was deleted.

105 changes: 16 additions & 89 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,12 @@
{
"command": "swift.runSnippet",
"title": "Run Swift Snippet",
"category": "Swift",
"icon": "$(play)"
"category": "Swift"
},
{
"command": "swift.debugSnippet",
"title": "Debug Swift Snippet",
"category": "Swift",
"icon": "$(debug)"
"category": "Swift"
},
{
"command": "swift.runPluginTask",
Expand Down Expand Up @@ -268,27 +266,8 @@
},
{
"command": "swift.runAllTestsParallel",
"title": "Run Tests in Parallel",
"category": "Test",
"icon": "$(testing-run-all-icon)"
},
{
"command": "swift.runAllTests",
"title": "Run Tests",
"category": "Test",
"icon": "$(testing-run-icon)"
},
{
"command": "swift.debugAllTests",
"title": "Debug Tests",
"category": "Test",
"icon": "$(testing-debug-icon)"
},
{
"command": "swift.coverAllTests",
"title": "Run Tests with Coverage",
"category": "Test",
"icon": "$(debug-coverage)"
"title": "Run All Tests in Parallel",
"category": "Test"
}
],
"configuration": [
Expand Down Expand Up @@ -931,18 +910,6 @@
{
"command": "swift.runAllTestsParallel",
"when": "swift.isActivated"
},
{
"command": "swift.runAllTests",
"when": "swift.isActivated"
},
{
"command": "swift.debugAllTests",
"when": "swift.isActivated"
},
{
"command": "swift.coverAllTests",
"when": "swift.isActivated"
}
],
"editor/context": [
Expand Down Expand Up @@ -1004,90 +971,50 @@
"view/title": [
{
"command": "swift.updateDependencies",
"when": "view == projectPanel",
"when": "view == packageDependencies",
"group": "navigation@1"
},
{
"command": "swift.resolveDependencies",
"when": "view == projectPanel",
"when": "view == packageDependencies",
"group": "navigation@2"
},
{
"command": "swift.resetPackage",
"when": "view == projectPanel",
"when": "view == packageDependencies",
"group": "navigation@3"
},
{
"command": "swift.flatDependenciesList",
"when": "view == projectPanel && !swift.flatDependenciesList",
"when": "view == packageDependencies && !swift.flatDependenciesList",
"group": "navigation@4"
},
{
"command": "swift.nestedDependenciesList",
"when": "view == projectPanel && swift.flatDependenciesList",
"when": "view == packageDependencies && swift.flatDependenciesList",
"group": "navigation@5"
}
],
"view/item/context": [
{
"command": "swift.useLocalDependency",
"when": "view == projectPanel && viewItem == remote"
"when": "view == packageDependencies && viewItem == remote"
},
{
"command": "swift.uneditDependency",
"when": "view == projectPanel && viewItem == editing"
"when": "view == packageDependencies && viewItem == editing"
},
{
"command": "swift.openInWorkspace",
"when": "view == projectPanel && viewItem == editing"
"when": "view == packageDependencies && viewItem == editing"
},
{
"command": "swift.openInWorkspace",
"when": "view == projectPanel && viewItem == local"
"when": "view == packageDependencies && viewItem == local"
},
{
"command": "swift.openExternal",
"when": "view == projectPanel && (viewItem == 'editing' || viewItem == 'remote')"
},
{
"command": "swift.run",
"when": "view == projectPanel && viewItem == 'runnable'",
"group": "inline@0"
},
{
"command": "swift.debug",
"when": "view == projectPanel && viewItem == 'runnable'",
"group": "inline@1"
},
{
"command": "swift.runSnippet",
"when": "view == projectPanel && viewItem == 'snippet_runnable'",
"group": "inline@0"
},
{
"command": "swift.debugSnippet",
"when": "view == projectPanel && viewItem == 'snippet_runnable'",
"group": "inline@1"
},
{
"command": "swift.runAllTests",
"when": "view == projectPanel && viewItem == 'test_runnable'",
"group": "inline@0"
},
{
"command": "swift.debugAllTests",
"when": "view == projectPanel && viewItem == 'test_runnable'",
"group": "inline@1"
},
{
"command": "swift.runAllTestsParallel",
"when": "view == projectPanel && viewItem == 'test_runnable'",
"group": "inline@2"
},
{
"command": "swift.coverAllTests",
"when": "view == projectPanel && viewItem == 'test_runnable'",
"group": "inline@3"
"when": "view == packageDependencies && viewItem != local"
}
]
},
Expand Down Expand Up @@ -1284,8 +1211,8 @@
"views": {
"explorer": [
{
"id": "projectPanel",
"name": "Swift Project",
"id": "packageDependencies",
"name": "Package Dependencies",
"icon": "$(archive)",
"when": "swift.hasPackage"
}
Expand Down
12 changes: 0 additions & 12 deletions src/PackageWatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export class PackageWatcher {
private packageFileWatcher?: vscode.FileSystemWatcher;
private resolvedFileWatcher?: vscode.FileSystemWatcher;
private workspaceStateFileWatcher?: vscode.FileSystemWatcher;
private snippetWatcher?: vscode.FileSystemWatcher;

constructor(
private folderContext: FolderContext,
Expand All @@ -42,7 +41,6 @@ export class PackageWatcher {
this.packageFileWatcher = this.createPackageFileWatcher();
this.resolvedFileWatcher = this.createResolvedFileWatcher();
this.workspaceStateFileWatcher = this.createWorkspaceStateFileWatcher();
this.snippetWatcher = this.createSnippetFileWatcher();
}

/**
Expand All @@ -53,7 +51,6 @@ export class PackageWatcher {
this.packageFileWatcher?.dispose();
this.resolvedFileWatcher?.dispose();
this.workspaceStateFileWatcher?.dispose();
this.snippetWatcher?.dispose();
}

private createPackageFileWatcher(): vscode.FileSystemWatcher {
Expand Down Expand Up @@ -90,15 +87,6 @@ export class PackageWatcher {
return watcher;
}

private createSnippetFileWatcher(): vscode.FileSystemWatcher {
const watcher = vscode.workspace.createFileSystemWatcher(
new vscode.RelativePattern(this.folderContext.folder, "Snippets/*.swift")
);
watcher.onDidCreate(async () => await this.handlePackageSwiftChange());
watcher.onDidDelete(async () => await this.handlePackageSwiftChange());
return watcher;
}

/**
* Handles a create or change event for **Package.swift**.
*
Expand Down
2 changes: 1 addition & 1 deletion src/SwiftPackage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export interface Target {
c99name: string;
path: string;
sources: string[];
type: "executable" | "test" | "library" | "snippet" | "plugin";
type: "executable" | "test" | "library" | "snippet";
}

/** Swift Package Manager dependency */
Expand Down
Loading
Loading