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.

Sign up for GitHub

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

Jump to bottom

Show breakpoint decorations in notebook #171847

Merged
merged 1 commit into from
Jan 20, 2023
Merged

Show breakpoint decorations in notebook #171847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { dispose, disposeIfDisposable, IDisposable } from 'vs/base/common/lifecy
import * as env from 'vs/base/common/platform';
import severity from 'vs/base/common/severity';
import { noBreakWhitespace } from 'vs/base/common/strings';
import { ThemeIcon } from 'vs/base/common/themables';
import { withNullAsUndefined } from 'vs/base/common/types';
import { URI } from 'vs/base/common/uri';
import { generateUuid } from 'vs/base/common/uuid';
Expand All @@ -34,7 +35,6 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
import { ILabelService } from 'vs/platform/label/common/label';
import { registerColor } from 'vs/platform/theme/common/colorRegistry';
import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
import { ThemeIcon } from 'vs/base/common/themables';
import { getBreakpointMessageAndIcon } from 'vs/workbench/contrib/debug/browser/breakpointsView';
import { BreakpointWidget } from 'vs/workbench/contrib/debug/browser/breakpointWidget';
import * as icons from 'vs/workbench/contrib/debug/browser/debugIcons';
Expand Down Expand Up @@ -794,7 +794,7 @@ registerThemingParticipant((theme, collector) => {
}
});

const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', { dark: '#E51400', light: '#E51400', hcDark: '#E51400', hcLight: '#E51400' }, nls.localize('debugIcon.breakpointForeground', 'Icon color for breakpoints.'));
export const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', { dark: '#E51400', light: '#E51400', hcDark: '#E51400', hcLight: '#E51400' }, nls.localize('debugIcon.breakpointForeground', 'Icon color for breakpoints.'));
const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, nls.localize('debugIcon.breakpointDisabledForeground', 'Icon color for disabled breakpoints.'));
const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, nls.localize('debugIcon.breakpointUnverifiedForeground', 'Icon color for unverified breakpoints.'));
const debugIconBreakpointCurrentStackframeForeground = registerColor('debugIcon.breakpointCurrentStackframeForeground', { dark: '#FFCC00', light: '#BE8700', hcDark: '#FFCC00', hcLight: '#BE8700' }, nls.localize('debugIcon.breakpointCurrentStackframeForeground', 'Icon color for the current breakpoint stack frame.'));
Expand Down
51 changes: 47 additions & 4 deletions src/vs/workbench/contrib/notebook/browser/contrib/debug/notebookDebugDecorations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import { Disposable } from 'vs/base/common/lifecycle';
import { IRange, Range } from 'vs/editor/common/core/range';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { debugIconBreakpointForeground } from 'vs/workbench/contrib/debug/browser/breakpointEditorContribution';
import { focusedStackFrameColor, topStackFrameColor } from 'vs/workbench/contrib/debug/browser/callStackEditorContribution';
import { IDebugService, IStackFrame } from 'vs/workbench/contrib/debug/common/debug';
import { INotebookCellDecorationOptions, INotebookDeltaDecoration, INotebookEditor, INotebookEditorContribution, NotebookOverviewRulerLane } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
Expand Down Expand Up @@ -33,16 +35,16 @@ export class PausedCellDecorationContribution extends Disposable implements INot
) {
super();

this._register(_debugService.getModel().onDidChangeCallStack(() => this.onDidChangeCallStack()));
this._register(_debugService.getViewModel().onDidFocusStackFrame(() => this.onDidChangeCallStack()));
this._register(_debugService.getModel().onDidChangeCallStack(() => this.updateExecutionDecorations()));
this._register(_debugService.getViewModel().onDidFocusStackFrame(() => this.updateExecutionDecorations()));
this._register(_notebookExecutionStateService.onDidChangeCellExecution(e => {
if (e.affectsNotebook(this._notebookEditor.textModel!.uri)) {
this.onDidChangeCallStack();
this.updateExecutionDecorations();
}
}));
}

private onDidChangeCallStack(): void {
private updateExecutionDecorations(): void {
const exes = this._notebookExecutionStateService.getCellExecutionsByHandleForNotebook(this._notebookEditor.textModel!.uri);

const topFrameCellsAndRanges: ICellAndRange[] = [];
Expand Down Expand Up @@ -141,3 +143,44 @@ export class PausedCellDecorationContribution extends Disposable implements INot
}

registerNotebookContribution(PausedCellDecorationContribution.id, PausedCellDecorationContribution);

export class NotebookBreakpointDecorations extends Disposable implements INotebookEditorContribution {
static id: string = 'workbench.notebook.debug.notebookBreakpointDecorations';

private _currentDecorations: string[] = [];

constructor(
private readonly _notebookEditor: INotebookEditor,
@IDebugService private readonly _debugService: IDebugService,
@IConfigurationService private readonly _configService: IConfigurationService,
) {
super();
this._register(_debugService.getModel().onDidChangeBreakpoints(() => this.updateDecorations()));
this._register(_configService.onDidChangeConfiguration(e => e.affectsConfiguration('debug.showBreakpointsInOverviewRuler') && this.updateDecorations()));
}

private updateDecorations(): void {
const enabled = this._configService.getValue('debug.showBreakpointsInOverviewRuler');
const newDecorations = enabled ?
this._debugService.getModel().getBreakpoints().map(breakpoint => {
const parsed = CellUri.parse(breakpoint.uri);
if (!parsed || parsed.notebook.toString() !== this._notebookEditor.textModel!.uri.toString()) {
return null;
}

const options: INotebookCellDecorationOptions = {
overviewRuler: {
color: debugIconBreakpointForeground,
includeOutput: false,
modelRanges: [new Range(breakpoint.lineNumber, 0, breakpoint.lineNumber, 0)],
position: NotebookOverviewRulerLane.Left
}
};
return { handle: parsed.handle, options };
}).filter(x => !!x) as INotebookDeltaDecoration[]
: [];
this._currentDecorations = this._notebookEditor.deltaCellDecorations(this._currentDecorations, newDecorations);
}
}

registerNotebookContribution(NotebookBreakpointDecorations.id, NotebookBreakpointDecorations);