Skip to content

Commit fceefd6

Browse files
authored
Revert "Project Panel (#1382)"
This reverts commit 5753b6b.
1 parent 5753b6b commit fceefd6

31 files changed

+521
-1302
lines changed

assets/test/targets/Package.swift

-48
This file was deleted.

assets/test/targets/Plugins/PluginTarget/main.swift

-9
This file was deleted.

assets/test/targets/Snippets/AnotherSnippet.swift

-1
This file was deleted.

assets/test/targets/Snippets/Snippet.swift

-1
This file was deleted.

assets/test/targets/Sources/CommandPluginTarget/CommandPluginTarget.swift

Whitespace-only changes.

assets/test/targets/Sources/ExecutableTarget/main.swift

-1
This file was deleted.

assets/test/targets/Sources/LibraryTarget/Targets.swift

-9
This file was deleted.

assets/test/targets/Tests/AnotherTests/AnotherTests.swift

-8
This file was deleted.

assets/test/targets/Tests/TargetsTests/TargetsTests.swift

-8
This file was deleted.

package.json

+16-89
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,12 @@
222222
{
223223
"command": "swift.runSnippet",
224224
"title": "Run Swift Snippet",
225-
"category": "Swift",
226-
"icon": "$(play)"
225+
"category": "Swift"
227226
},
228227
{
229228
"command": "swift.debugSnippet",
230229
"title": "Debug Swift Snippet",
231-
"category": "Swift",
232-
"icon": "$(debug)"
230+
"category": "Swift"
233231
},
234232
{
235233
"command": "swift.runPluginTask",
@@ -268,27 +266,8 @@
268266
},
269267
{
270268
"command": "swift.runAllTestsParallel",
271-
"title": "Run Tests in Parallel",
272-
"category": "Test",
273-
"icon": "$(testing-run-all-icon)"
274-
},
275-
{
276-
"command": "swift.runAllTests",
277-
"title": "Run Tests",
278-
"category": "Test",
279-
"icon": "$(testing-run-icon)"
280-
},
281-
{
282-
"command": "swift.debugAllTests",
283-
"title": "Debug Tests",
284-
"category": "Test",
285-
"icon": "$(testing-debug-icon)"
286-
},
287-
{
288-
"command": "swift.coverAllTests",
289-
"title": "Run Tests with Coverage",
290-
"category": "Test",
291-
"icon": "$(debug-coverage)"
269+
"title": "Run All Tests in Parallel",
270+
"category": "Test"
292271
}
293272
],
294273
"configuration": [
@@ -931,18 +910,6 @@
931910
{
932911
"command": "swift.runAllTestsParallel",
933912
"when": "swift.isActivated"
934-
},
935-
{
936-
"command": "swift.runAllTests",
937-
"when": "swift.isActivated"
938-
},
939-
{
940-
"command": "swift.debugAllTests",
941-
"when": "swift.isActivated"
942-
},
943-
{
944-
"command": "swift.coverAllTests",
945-
"when": "swift.isActivated"
946913
}
947914
],
948915
"editor/context": [
@@ -1004,90 +971,50 @@
1004971
"view/title": [
1005972
{
1006973
"command": "swift.updateDependencies",
1007-
"when": "view == projectPanel",
974+
"when": "view == packageDependencies",
1008975
"group": "navigation@1"
1009976
},
1010977
{
1011978
"command": "swift.resolveDependencies",
1012-
"when": "view == projectPanel",
979+
"when": "view == packageDependencies",
1013980
"group": "navigation@2"
1014981
},
1015982
{
1016983
"command": "swift.resetPackage",
1017-
"when": "view == projectPanel",
984+
"when": "view == packageDependencies",
1018985
"group": "navigation@3"
1019986
},
1020987
{
1021988
"command": "swift.flatDependenciesList",
1022-
"when": "view == projectPanel && !swift.flatDependenciesList",
989+
"when": "view == packageDependencies && !swift.flatDependenciesList",
1023990
"group": "navigation@4"
1024991
},
1025992
{
1026993
"command": "swift.nestedDependenciesList",
1027-
"when": "view == projectPanel && swift.flatDependenciesList",
994+
"when": "view == packageDependencies && swift.flatDependenciesList",
1028995
"group": "navigation@5"
1029996
}
1030997
],
1031998
"view/item/context": [
1032999
{
10331000
"command": "swift.useLocalDependency",
1034-
"when": "view == projectPanel && viewItem == remote"
1001+
"when": "view == packageDependencies && viewItem == remote"
10351002
},
10361003
{
10371004
"command": "swift.uneditDependency",
1038-
"when": "view == projectPanel && viewItem == editing"
1005+
"when": "view == packageDependencies && viewItem == editing"
10391006
},
10401007
{
10411008
"command": "swift.openInWorkspace",
1042-
"when": "view == projectPanel && viewItem == editing"
1009+
"when": "view == packageDependencies && viewItem == editing"
10431010
},
10441011
{
10451012
"command": "swift.openInWorkspace",
1046-
"when": "view == projectPanel && viewItem == local"
1013+
"when": "view == packageDependencies && viewItem == local"
10471014
},
10481015
{
10491016
"command": "swift.openExternal",
1050-
"when": "view == projectPanel && (viewItem == 'editing' || viewItem == 'remote')"
1051-
},
1052-
{
1053-
"command": "swift.run",
1054-
"when": "view == projectPanel && viewItem == 'runnable'",
1055-
"group": "inline@0"
1056-
},
1057-
{
1058-
"command": "swift.debug",
1059-
"when": "view == projectPanel && viewItem == 'runnable'",
1060-
"group": "inline@1"
1061-
},
1062-
{
1063-
"command": "swift.runSnippet",
1064-
"when": "view == projectPanel && viewItem == 'snippet_runnable'",
1065-
"group": "inline@0"
1066-
},
1067-
{
1068-
"command": "swift.debugSnippet",
1069-
"when": "view == projectPanel && viewItem == 'snippet_runnable'",
1070-
"group": "inline@1"
1071-
},
1072-
{
1073-
"command": "swift.runAllTests",
1074-
"when": "view == projectPanel && viewItem == 'test_runnable'",
1075-
"group": "inline@0"
1076-
},
1077-
{
1078-
"command": "swift.debugAllTests",
1079-
"when": "view == projectPanel && viewItem == 'test_runnable'",
1080-
"group": "inline@1"
1081-
},
1082-
{
1083-
"command": "swift.runAllTestsParallel",
1084-
"when": "view == projectPanel && viewItem == 'test_runnable'",
1085-
"group": "inline@2"
1086-
},
1087-
{
1088-
"command": "swift.coverAllTests",
1089-
"when": "view == projectPanel && viewItem == 'test_runnable'",
1090-
"group": "inline@3"
1017+
"when": "view == packageDependencies && viewItem != local"
10911018
}
10921019
]
10931020
},
@@ -1284,8 +1211,8 @@
12841211
"views": {
12851212
"explorer": [
12861213
{
1287-
"id": "projectPanel",
1288-
"name": "Swift Project",
1214+
"id": "packageDependencies",
1215+
"name": "Package Dependencies",
12891216
"icon": "$(archive)",
12901217
"when": "swift.hasPackage"
12911218
}

src/PackageWatcher.ts

-12
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export class PackageWatcher {
2727
private packageFileWatcher?: vscode.FileSystemWatcher;
2828
private resolvedFileWatcher?: vscode.FileSystemWatcher;
2929
private workspaceStateFileWatcher?: vscode.FileSystemWatcher;
30-
private snippetWatcher?: vscode.FileSystemWatcher;
3130

3231
constructor(
3332
private folderContext: FolderContext,
@@ -42,7 +41,6 @@ export class PackageWatcher {
4241
this.packageFileWatcher = this.createPackageFileWatcher();
4342
this.resolvedFileWatcher = this.createResolvedFileWatcher();
4443
this.workspaceStateFileWatcher = this.createWorkspaceStateFileWatcher();
45-
this.snippetWatcher = this.createSnippetFileWatcher();
4644
}
4745

4846
/**
@@ -53,7 +51,6 @@ export class PackageWatcher {
5351
this.packageFileWatcher?.dispose();
5452
this.resolvedFileWatcher?.dispose();
5553
this.workspaceStateFileWatcher?.dispose();
56-
this.snippetWatcher?.dispose();
5754
}
5855

5956
private createPackageFileWatcher(): vscode.FileSystemWatcher {
@@ -90,15 +87,6 @@ export class PackageWatcher {
9087
return watcher;
9188
}
9289

93-
private createSnippetFileWatcher(): vscode.FileSystemWatcher {
94-
const watcher = vscode.workspace.createFileSystemWatcher(
95-
new vscode.RelativePattern(this.folderContext.folder, "Snippets/*.swift")
96-
);
97-
watcher.onDidCreate(async () => await this.handlePackageSwiftChange());
98-
watcher.onDidDelete(async () => await this.handlePackageSwiftChange());
99-
return watcher;
100-
}
101-
10290
/**
10391
* Handles a create or change event for **Package.swift**.
10492
*

src/SwiftPackage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export interface Target {
4141
c99name: string;
4242
path: string;
4343
sources: string[];
44-
type: "executable" | "test" | "library" | "snippet" | "plugin";
44+
type: "executable" | "test" | "library" | "snippet";
4545
}
4646

4747
/** Swift Package Manager dependency */

0 commit comments

Comments
 (0)