diff --git a/package-lock.json b/package-lock.json index 7d774ece0860..a08b84531610 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4169,9 +4169,9 @@ } }, "@types/vscode": { - "version": "1.48.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.48.0.tgz", - "integrity": "sha512-sZJKzsJz1gSoFXcOJWw3fnKl2sseUgZmvB4AJZS+Fea+bC/jfGPVhmFL/FfQHld/TKtukVONsmoD3Pkyx9iadg==", + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz", + "integrity": "sha512-QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg==", "dev": true }, "@types/vscode-notebook-renderer": { diff --git a/package.json b/package.json index 8262453a3abf..405a38769be8 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "theme": "dark" }, "engines": { - "vscode": "^1.48.0" + "vscode": "^1.49.0" }, "keywords": [ "python", @@ -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", diff --git a/src/client/datascience/interactive-common/interactiveWindowTypes.ts b/src/client/datascience/interactive-common/interactiveWindowTypes.ts index 128dbbc7df37..05c00622a965 100644 --- a/src/client/datascience/interactive-common/interactiveWindowTypes.ts +++ b/src/client/datascience/interactive-common/interactiveWindowTypes.ts @@ -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'; diff --git a/src/client/datascience/jupyterDebugService.ts b/src/client/datascience/jupyterDebugService.ts index 091d13f7a437..c098fbfc3542 100644 --- a/src/client/datascience/jupyterDebugService.ts +++ b/src/client/datascience/jupyterDebugService.ts @@ -12,6 +12,7 @@ import { DebugConfiguration, DebugConfigurationProvider, DebugConsole, + DebugProtocolBreakpoint, DebugSession, DebugSessionCustomEvent, Disposable, @@ -63,6 +64,9 @@ class JupyterDebugSession implements DebugSession { public customRequest(command: string, args?: any): Thenable { return this.customRequestHandler(command, args); } + public getDebugProtocolBreakpoint(_breakpoint: Breakpoint): Thenable { + return Promise.resolve(undefined); + } } //tslint:disable:trailing-comma no-any no-multiline-string diff --git a/src/test/debugger/extension/adapter/factory.unit.test.ts b/src/test/debugger/extension/adapter/factory.unit.test.ts index 75393f95960c..35186025640d 100644 --- a/src/test/debugger/extension/adapter/factory.unit.test.ts +++ b/src/test/debugger/extension/adapter/factory.unit.test.ts @@ -97,7 +97,8 @@ suite('Debugging - Adapter Factory', () => { name: 'python', type: 'python', workspaceFolder, - customRequest: () => Promise.resolve() + customRequest: () => Promise.resolve(), + getDebugProtocolBreakpoint: () => Promise.resolve({}) }; } diff --git a/src/test/debugger/extension/adapter/logging.unit.test.ts b/src/test/debugger/extension/adapter/logging.unit.test.ts index cae4d7b19328..5b32ca254057 100644 --- a/src/test/debugger/extension/adapter/logging.unit.test.ts +++ b/src/test/debugger/extension/adapter/logging.unit.test.ts @@ -48,7 +48,8 @@ suite('Debugging - Session Logging', () => { name: 'python', type: 'python', workspaceFolder, - customRequest: () => Promise.resolve() + customRequest: () => Promise.resolve(), + getDebugProtocolBreakpoint: () => Promise.resolve({}) }; } diff --git a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts index cb7643397552..0aedb69da4d0 100644 --- a/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts +++ b/src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts @@ -64,7 +64,8 @@ suite('Debugging - Outdated Debugger Prompt tests.', () => { name: 'python', type: 'python', workspaceFolder, - customRequest: () => Promise.resolve() + customRequest: () => Promise.resolve(), + getDebugProtocolBreakpoint: () => Promise.resolve({}) }; } diff --git a/src/test/mocks/vsc/extHostedTypes.ts b/src/test/mocks/vsc/extHostedTypes.ts index fc8f77279b65..ed1580c0f2f7 100644 --- a/src/test/mocks/vsc/extHostedTypes.ts +++ b/src/test/mocks/vsc/extHostedTypes.ts @@ -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 diff --git a/src/test/vscode-mock.ts b/src/test/vscode-mock.ts index f3380316faa8..87185fbbc3e9 100644 --- a/src/test/vscode-mock.ts +++ b/src/test/vscode-mock.ts @@ -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(); diff --git a/types/vscode-proposed/index.d.ts b/types/vscode-proposed/index.d.ts index 8c4fc94024b8..aa28a2ebb758 100644 --- a/types/vscode-proposed/index.d.ts +++ b/types/vscode-proposed/index.d.ts @@ -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 { diff --git a/typings/vscode-proposed/index.d.ts b/typings/vscode-proposed/index.d.ts index d78ec147d08b..cc0489c72900 100644 --- a/typings/vscode-proposed/index.d.ts +++ b/typings/vscode-proposed/index.d.ts @@ -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 {