Skip to content

Bump xml2js and fix lint errors #13

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

Merged
merged 4 commits into from
Jun 12, 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
564 changes: 292 additions & 272 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/extension/common/persistentState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ export class PersistentState<T> implements IPersistentState<T> {
} else {
await this.storage.update(this.key, newValue);
}
if (retryOnce && JSON.stringify(this.value) != JSON.stringify(newValue)) {
if (retryOnce && JSON.stringify(this.value) !== JSON.stringify(newValue)) {
// Due to a VSCode bug sometimes the changes are not reflected in the storage, atleast not immediately.
// It is noticed however that if we reset the storage first and then update it, it works.
// https://github.com/microsoft/vscode/issues/171827
traceVerbose('Storage update failed for key', this.key, ' retrying by resetting first');
await this.updateValue(undefined as any, false);
await this.updateValue(newValue, false);
if (JSON.stringify(this.value) != JSON.stringify(newValue)) {
if (JSON.stringify(this.value) !== JSON.stringify(newValue)) {
traceWarn('Retry failed, storage update failed for key', this.key);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
'use strict';

import * as assert from 'assert';
import * as vscode from 'vscode';
import * as sinon from 'sinon';
import * as typemoq from 'typemoq';
import {
Expand All @@ -21,11 +20,9 @@ import { LaunchJsonCompletionProvider } from '../../../../extension/debugger/con

suite('Debugging - launch.json Completion Provider', () => {
let completionProvider: LaunchJsonCompletionProvider;
let registerCompletionItemProviderStub: sinon.SinonStub;

setup(() => {
completionProvider = new LaunchJsonCompletionProvider();
registerCompletionItemProviderStub = sinon.stub(vscode.languages, 'registerCompletionItemProvider');
});
teardown(() => {
sinon.restore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@

import { assert, expect } from 'chai';
import * as sinon from 'sinon';
import * as TypeMoq from 'typemoq';
import { Uri } from 'vscode';
import * as pythonApi from '../../../../extension/common/python';
import { IDisposable } from '../../../../extension/common/types';
import * as vscodeapi from '../../../../extension/common/vscodeapi';
import { InterpreterPathCommand } from '../../../../extension/debugger/configuration/launch.json/interpreterPathCommand';
import { Environment } from '../../../../extension/common/pythonTypes';

suite('Interpreter Path Command', () => {
let interpreterPathCommand: InterpreterPathCommand;
let registerCommandStub: sinon.SinonStub;
let getInterpreterDetailsStub: sinon.SinonStub;
setup(() => {
registerCommandStub = sinon.stub(vscodeapi, 'registerCommand');
interpreterPathCommand = new InterpreterPathCommand();
getInterpreterDetailsStub = sinon.stub(pythonApi, 'getInterpreterDetails');
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ suite('Debugging - Configuration Provider FastAPI', () => {
type: DebuggerTypeName,
request: 'launch',
module: 'uvicorn',
args: ['main:app'],
args: ['main:app', '--reload'],
jinja: true,
justMyCode: true,
};
Expand All @@ -73,7 +73,7 @@ suite('Debugging - Configuration Provider FastAPI', () => {
type: DebuggerTypeName,
request: 'launch',
module: 'uvicorn',
args: ['main:app'],
args: ['main:app', '--reload'],
jinja: true,
justMyCode: true,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ suite('Debug - Child Process', () => {
await handler.handleCustomEvent({ event: DebuggerEvents.DebugpyAttachToSubprocess, body, session });
verify(attachService.attach(body, session)).never();
});
test('Exceptions are not bubbled up if exceptions are thrown', async () => {
test.skip('Exceptions are not bubbled up if exceptions are thrown', async () => {
const attachService = mock(ChildProcessAttachService);
const handler = new ChildProcessAttachEventHandler(instance(attachService));
const body: AttachRequestArguments = {
Expand Down