Skip to content

Commit d693b49

Browse files
committed
revert unnecessary changes
1 parent 803567d commit d693b49

File tree

7 files changed

+7
-179
lines changed

7 files changed

+7
-179
lines changed

package-lock.json

Lines changed: 0 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,7 @@
434434
},
435435
"dependencies": {
436436
"@types/plist": "^3.0.2",
437-
"checksum": "^1.0.0",
438437
"plist": "^3.0.5",
439438
"vscode-languageclient": "^8.0.0"
440439
}
441-
}
440+
}

src/FolderContext.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ export class FolderContext implements vscode.Disposable {
123123
await this.swiftPackage.reloadPackageResolved();
124124
}
125125

126-
get resolvedContent(): string | undefined {
127-
return this.resolvedContent;
128-
}
129-
130126
/**
131127
* Fire an event to all folder observers
132128
* @param event event type
@@ -162,7 +158,7 @@ export class FolderContext implements vscode.Disposable {
162158
);
163159
}
164160

165-
/** Get list of all packages */
161+
/** Get list in-use packages */
166162
async resolveDependencyGraph(): Promise<WorkspaceStateDependency[]> {
167163
return await this.swiftPackage.resolveDependencyGraph();
168164
}

src/SwiftPackage.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,6 @@ export class SwiftPackage implements PackageContents {
273273
try {
274274
const uri = vscode.Uri.joinPath(folder, "Package.resolved");
275275
const contents = await fs.readFile(uri.fsPath, "utf8");
276-
if (contents === undefined) {
277-
return undefined;
278-
}
279276
const json = JSON.parse(contents);
280277
const version = <{ version: number }>json;
281278
if (version.version === 1) {
@@ -348,12 +345,9 @@ export class SwiftPackage implements PackageContents {
348345
}
349346

350347
const contents = this.contents as PackageContents;
351-
console.log("== resolve graph begin");
352348
const showingDependencies = new Set<string>();
353349
await this.getChildDependencies(contents, workspaceStateDependencies, showingDependencies);
354350

355-
console.log("== resolve graph done");
356-
357351
// filter workspaceStateDependencies that in showingDependencies
358352
return workspaceStateDependencies.filter(dependency =>
359353
showingDependencies.has(dependency.packageRef.identity)

src/SwiftTaskProvider.ts

Lines changed: 1 addition & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@ import { WorkspaceContext } from "./WorkspaceContext";
1818
import { FolderContext } from "./FolderContext";
1919
import { Product } from "./SwiftPackage";
2020
import configuration from "./configuration";
21-
import {
22-
execSwift,
23-
getSwiftExecutable,
24-
swiftRuntimeEnv,
25-
withSwiftSDKFlags,
26-
} from "./utilities/utilities";
21+
import { getSwiftExecutable, swiftRuntimeEnv, withSwiftSDKFlags } from "./utilities/utilities";
2722
import { Version } from "./utilities/version";
2823

2924
/**
@@ -217,7 +212,6 @@ export function createSwiftTask(args: string[], name: string, config: TaskConfig
217212
}),
218213
config?.problemMatcher
219214
);
220-
221215
// This doesn't include any quotes added by VS Code.
222216
// See also: https://github.com/microsoft/vscode/issues/137895
223217

@@ -233,66 +227,6 @@ export function createSwiftTask(args: string[], name: string, config: TaskConfig
233227
return task;
234228
}
235229

236-
interface SwiftOutput {
237-
(stdout: string, stderr: string): void;
238-
}
239-
240-
/**
241-
* Helper function to create a {@link vscode.Task Task} with the given parameters.
242-
*/
243-
export function createSwiftTask2(
244-
args: string[],
245-
name: string,
246-
config: TaskConfig,
247-
output: SwiftOutput
248-
): vscode.Task {
249-
args = withSwiftSDKFlags(args);
250-
251-
// Add relative path current working directory
252-
const cwd = config.cwd.fsPath;
253-
const fullCwd = config.cwd.fsPath;
254-
255-
/* Currently there seems to be a bug in vscode where kicking off two tasks
256-
with the same definition but different scopes messes with the task
257-
completion code. When that is resolved we will go back to the code below
258-
where we only store the relative cwd instead of the full cwd
259-
260-
const scopeWorkspaceFolder = config.scope as vscode.WorkspaceFolder;
261-
if (scopeWorkspaceFolder.uri.fsPath) {
262-
cwd = path.relative(scopeWorkspaceFolder.uri.fsPath, config.cwd.fsPath);
263-
} else {
264-
cwd = config.cwd.fsPath;
265-
}*/
266-
267-
const task = new vscode.Task(
268-
{ type: "swift", args: args, cwd: cwd },
269-
config?.scope ?? vscode.TaskScope.Workspace,
270-
name,
271-
"swift",
272-
new vscode.CustomExecution(async (): Promise<vscode.Pseudoterminal> => {
273-
// When the task is executed, this callback will run. Here, we setup for running the task.
274-
const { stdout, stderr } = await execSwift(args, {
275-
cwd: fullCwd,
276-
});
277-
278-
output(stdout, stderr);
279-
return new CustomSwiftTaskTerminal("1");
280-
}),
281-
config?.problemMatcher
282-
);
283-
284-
let prefix: string;
285-
if (config?.prefix) {
286-
prefix = `(${config.prefix}) `;
287-
} else {
288-
prefix = "";
289-
}
290-
task.detail = `${prefix}swift ${args.join(" ")}`;
291-
task.group = config?.group;
292-
task.presentationOptions = config?.presentationOptions ?? {};
293-
return task;
294-
}
295-
296230
/**
297231
* A {@link vscode.TaskProvider TaskProvider} for tasks that match the definition
298232
* in **package.json**: `{ type: 'swift'; args: string[], cwd: string? }`.
@@ -370,36 +304,3 @@ export class SwiftTaskProvider implements vscode.TaskProvider {
370304
return newTask;
371305
}
372306
}
373-
374-
class CustomSwiftTaskTerminal implements vscode.Pseudoterminal {
375-
private writeEmitter = new vscode.EventEmitter<string>();
376-
onDidWrite: vscode.Event<string> = this.writeEmitter.event;
377-
private closeEmitter = new vscode.EventEmitter<number>();
378-
onDidClose?: vscode.Event<number> = this.closeEmitter.event;
379-
380-
constructor(private workspaceRoot: string) {}
381-
382-
open(initialDimensions: vscode.TerminalDimensions | undefined): void {
383-
// At this point we can start using the
384-
// print initialDimensions to set the size of the terminal.
385-
console.log(initialDimensions);
386-
this.resolveDependencyGraph();
387-
}
388-
389-
close(): void {
390-
// The terminal has been closed. Shutdown the build.
391-
}
392-
393-
private async resolveDependencyGraph(): Promise<void> {
394-
return new Promise<void>(resolve => {
395-
this.writeEmitter.fire("Starting build...\r\n");
396-
397-
// Since we don't actually build anything in this example set a timeout instead.
398-
setTimeout(() => {
399-
this.writeEmitter.fire("Build complete.\r\n\r\n");
400-
this.closeEmitter.fire(0);
401-
resolve();
402-
}, 1000);
403-
});
404-
}
405-
}

src/commands.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import * as vscode from "vscode";
1616
import * as fs from "fs/promises";
1717
import * as path from "path";
1818
import { FolderEvent, WorkspaceContext } from "./WorkspaceContext";
19-
import { createSwiftTask, createSwiftTask2, SwiftTaskProvider } from "./SwiftTaskProvider";
19+
import { createSwiftTask, SwiftTaskProvider } from "./SwiftTaskProvider";
2020
import { FolderContext } from "./FolderContext";
2121
import { PackageNode } from "./ui/PackageDependencyProvider";
2222
import { execSwift } from "./utilities/utilities";
@@ -432,11 +432,12 @@ function updateAfterError(result: boolean, folderContext: FolderContext) {
432432
const triggerResolvedUpdatedEvent = folderContext.hasResolveErrors;
433433
// set has resolve errors flag
434434
folderContext.hasResolveErrors = !result;
435+
435436
// if previous folder state was with resolve errors, and now it is without then
436-
// send Package.resolved updated event to trigger display of package dependencies
437+
// send workspace-state.json updated event to trigger display of package dependencies
437438
// view
438439
if (triggerResolvedUpdatedEvent && !folderContext.hasResolveErrors) {
439-
// TODO
440+
folderContext.fireEvent(FolderEvent.workspaceStateUpdated);
440441
}
441442
}
442443

src/extension.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
100100
if (folder.swiftPackage.foundPackage) {
101101
await commands.resolveFolderDependencies(folder, true);
102102
}
103-
break;
104103
}
105104
});
106105

0 commit comments

Comments
 (0)