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.

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

Update tas client #13636

Merged
merged 2 commits into from
Jun 2, 2023
Merged
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
62 changes: 31 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2082,7 +2082,7 @@
"vscode-languageclient": "8.0.2-next.5",
"vscode-languageserver": "8.0.2-next.5",
"vscode-languageserver-protocol": "3.17.2-next.6",
"vscode-tas-client": "^0.1.27",
"vscode-tas-client": "^0.1.63",
"ws": "^6.2.2",
"zeromq": "^6.0.0-beta.16",
"zeromqold": "npm:zeromq@^6.0.0-beta.6"
Expand Down
1 change: 0 additions & 1 deletion src/extension.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@ async function activateLegacy(
const experimentService = serviceContainer.get<IExperimentService>(IExperimentService);
// This must be done first, this guarantees all experiment information has loaded & all telemetry will contain experiment info.
await experimentService.activate();
experimentService.logExperiments();

const applicationEnv = serviceManager.get<IApplicationEnvironment>(IApplicationEnvironment);
const configuration = serviceManager.get<IConfigurationService>(IConfigurationService);
Expand Down
1 change: 0 additions & 1 deletion src/extension.web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ async function activateLegacy(
const experimentService = serviceContainer.get<IExperimentService>(IExperimentService);
// This must be done first, this guarantees all experiment information has loaded & all telemetry will contain experiment info.
await experimentService.activate();
experimentService.logExperiments();

const applicationEnv = serviceManager.get<IApplicationEnvironment>(IApplicationEnvironment);
const configuration = serviceManager.get<IConfigurationService>(IConfigurationService);
Expand Down
2 changes: 0 additions & 2 deletions src/kernels/jupyter/finder/remoteKernelFinder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ export class RemoteKernelFinder implements IRemoteKernelFinder, IDisposable {

private async getFromCache(cancelToken?: CancellationToken): Promise<RemoteKernelConnectionMetadata[]> {
try {
traceVerbose('UniversalRemoteKernelFinder: get from cache');

let results: RemoteKernelConnectionMetadata[] = this.cache;
const key = this.cacheKey;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ export async function findKernelSpecsInInterpreter(
}
});
results = results.filter((r) => !r.specFile || !originalSpecFiles.has(r.specFile));
traceVerbose(`Kernel Specs found in interpreter ${interpreter.id} are ${JSON.stringify(results)}`);
if (results.length) {
traceVerbose(`Kernel Specs found in interpreter ${interpreter.id} are ${JSON.stringify(results)}`);
}
// There was also an old bug where the same item would be registered more than once. Eliminate these dupes
// too.
const uniqueKernelSpecs: IJupyterKernelSpec[] = [];
Expand Down Expand Up @@ -169,7 +171,7 @@ export class InterpreterSpecificKernelSpecsFinder implements IDisposable {
private async listKernelSpecsImpl() {
const cancelToken = this.cancelToken.token;

traceVerbose(`Listing Python & non-Python kernels for Interpreter ${getDisplayPath(this.interpreter.uri)}`);
traceVerbose(`Search for KernelSpecs in Interpreter ${getDisplayPath(this.interpreter.uri)}`);
const [kernelSpecsBelongingToPythonEnvironment, tempDirForKernelSpecs] = await Promise.all([
findKernelSpecsInInterpreter(this.interpreter, cancelToken, this.jupyterPaths, this.kernelSpecFinder),
this.jupyterPaths.getKernelSpecTempRegistrationFolder()
Expand Down Expand Up @@ -215,7 +217,6 @@ export class InterpreterSpecificKernelSpecsFinder implements IDisposable {
id: getKernelId(k, this.interpreter)
});

traceVerbose(`Found kernel spec at end of discovery ${kernelSpec?.id}`);
// Check if we have already seen this.
if (kernelSpec && !distinctKernelMetadata.has(kernelSpec.id)) {
distinctKernelMetadata.set(kernelSpec.id, kernelSpec);
Expand All @@ -233,7 +234,6 @@ export class InterpreterSpecificKernelSpecsFinder implements IDisposable {
interpreter: this.interpreter,
id: getKernelId(spec, this.interpreter)
});
traceVerbose(`Kernel for interpreter ${this.interpreter.id} is ${result.id}`);
if (!distinctKernelMetadata.has(result.id)) {
distinctKernelMetadata.set(result.id, result);
}
Expand Down
5 changes: 2 additions & 3 deletions src/kernels/raw/finder/localKernelSpecFinderBase.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ export class LocalKernelSpecFinder implements IDisposable {
const files = await this.fs.searchLocal(`**/kernel.json`, kernelSearchPath.fsPath, true);
return files.map((item) => uriPath.joinPath(kernelSearchPath, item));
} else {
traceVerbose(`Not Searching for kernels as path does not exist, ${getDisplayPath(kernelSearchPath)}`);
return [];
}
})();
Expand Down Expand Up @@ -320,8 +319,8 @@ export async function loadKernelSpec(
let kernelJson: ReadWrite<IJupyterKernelSpec>;
try {
traceVerbose(
`Loading kernelspec from ${getDisplayPath(specPath)} for ${
interpreter?.uri ? getDisplayPath(interpreter.uri) : ''
`Loading kernelspec from ${getDisplayPath(specPath)} ${
interpreter?.uri ? `for ${getDisplayPath(interpreter.uri)}` : ''
}`
);
kernelJson = JSON.parse(await fs.readFile(specPath));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ export class LocalPythonAndRelatedNonPythonKernelSpecFinder extends LocalKernelS
this.disposables.push(this._onDidChangeKernels);
interpreterService.onDidChangeInterpreters(
() => {
traceVerbose(`refreshData after detecting changes to interpreters`);
this.refreshCancellation?.cancel();
this.refreshData().catch(noop);
},
Expand Down
4 changes: 0 additions & 4 deletions src/platform/common/experiments/groups.ts

This file was deleted.

Loading