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
6 changes: 3 additions & 3 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"theme": "dark"
},
"engines": {
"vscode": "^1.48.0"
"vscode": "^1.49.0"
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not 1.50

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DonJayamanne, I just saw this. I only wanted to bump to the minimum required, which in the case of the debug context menu contribution point is 1.49. Otherwise we're forcing users to upgrade when the extension really doesn't require it

},
"keywords": [
"python",
Expand Down Expand Up @@ -3654,7 +3654,7 @@
"@types/tmp": "0.0.33",
"@types/untildify": "^3.0.0",
"@types/uuid": "^3.4.3",
"@types/vscode": "^1.47.0",
"@types/vscode": "^1.49.0",
"@types/vscode-notebook-renderer": "^1.48.0",
"@types/webpack-bundle-analyzer": "^2.13.0",
"@types/winreg": "^1.2.30",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// Licensed under the MIT License.
'use strict';
import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api';
import { DebugProtocolVariable, DebugProtocolVariableContainer, Uri } from 'vscode';
import { Uri } from 'vscode';
import { DebugProtocolVariable, DebugProtocolVariableContainer } from '../../../../types/vscode-proposed';
import { DebugState, IServerState } from '../../../datascience-ui/interactive-common/mainState';

import type { KernelMessage } from '@jupyterlab/services';
Expand Down
4 changes: 4 additions & 0 deletions src/client/datascience/jupyterDebugService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
DebugConfiguration,
DebugConfigurationProvider,
DebugConsole,
DebugProtocolBreakpoint,
DebugSession,
DebugSessionCustomEvent,
Disposable,
Expand Down Expand Up @@ -63,6 +64,9 @@ class JupyterDebugSession implements DebugSession {
public customRequest(command: string, args?: any): Thenable<any> {
return this.customRequestHandler(command, args);
}
public getDebugProtocolBreakpoint(_breakpoint: Breakpoint): Thenable<DebugProtocolBreakpoint | undefined> {
return Promise.resolve(undefined);
}
}

//tslint:disable:trailing-comma no-any no-multiline-string
Expand Down
3 changes: 2 additions & 1 deletion src/test/debugger/extension/adapter/factory.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ suite('Debugging - Adapter Factory', () => {
name: 'python',
type: 'python',
workspaceFolder,
customRequest: () => Promise.resolve()
customRequest: () => Promise.resolve(),
getDebugProtocolBreakpoint: () => Promise.resolve({})
};
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/debugger/extension/adapter/logging.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ suite('Debugging - Session Logging', () => {
name: 'python',
type: 'python',
workspaceFolder,
customRequest: () => Promise.resolve()
customRequest: () => Promise.resolve(),
getDebugProtocolBreakpoint: () => Promise.resolve({})
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ suite('Debugging - Outdated Debugger Prompt tests.', () => {
name: 'python',
type: 'python',
workspaceFolder,
customRequest: () => Promise.resolve()
customRequest: () => Promise.resolve(),
getDebugProtocolBreakpoint: () => Promise.resolve({})
};
}

Expand Down
4 changes: 4 additions & 0 deletions src/test/mocks/vsc/extHostedTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import { vscUri } from './uri';
import { generateUuid } from './uuid';

export namespace vscMockExtHostedTypes {
export class DebugProtocolVariable {}

export class DebugProtocolVariableContainer {}

export enum CellKind {
Markdown = 1,
Code = 2
Expand Down
2 changes: 2 additions & 0 deletions src/test/vscode-mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ mockedVSCode.FileSystemError = vscodeMocks.vscMockExtHostedTypes.FileSystemError
(mockedVSCode as any).CellKind = vscodeMocks.vscMockExtHostedTypes.CellKind;
(mockedVSCode as any).CellOutputKind = vscodeMocks.vscMockExtHostedTypes.CellOutputKind;
(mockedVSCode as any).NotebookCellRunState = vscodeMocks.vscMockExtHostedTypes.NotebookCellRunState;
(mockedVSCode as any).DebugProtocolVariable = vscodeMocks.vscMockExtHostedTypes.DebugProtocolVariable;
(mockedVSCode as any).DebugProtocolVariableContainer = vscodeMocks.vscMockExtHostedTypes.DebugProtocolVariableContainer;

// This API is used in src/client/telemetry/telemetry.ts
const extensions = TypeMoq.Mock.ofType<typeof vscode.extensions>();
Expand Down
4 changes: 4 additions & 0 deletions types/vscode-proposed/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ export interface CellDisplayOutput {
readonly metadata?: NotebookCellOutputMetadata;
}

export interface DebugProtocolVariable { }

export interface DebugProtocolVariableContainer { }

export type CellOutput = CellStreamOutput | CellErrorOutput | CellDisplayOutput;

export enum NotebookCellRunState {
Expand Down
4 changes: 4 additions & 0 deletions typings/vscode-proposed/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ export interface CellDisplayOutput {
readonly metadata?: NotebookCellOutputMetadata;
}

export interface DebugProtocolVariable { }

export interface DebugProtocolVariableContainer { }

export type CellOutput = CellStreamOutput | CellErrorOutput | CellDisplayOutput;

export enum NotebookCellRunState {
Expand Down