mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 21:55:38 +00:00
debug: move getBreakpointMessageAndClassName to breakpointsView so it can be reused
This commit is contained in:
isidor
parent
950574c378
commit
7db7f5bd45
|
|
@ -33,6 +33,7 @@ import { ViewsViewletPanel, IViewletViewOptions } from 'vs/workbench/browser/par
|
|||
import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
|
||||
import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
|
||||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
|
||||
|
||||
const $ = dom.$;
|
||||
|
||||
|
|
@ -514,3 +515,69 @@ export function openBreakpointSource(breakpoint: Breakpoint, sideBySide: boolean
|
|||
}
|
||||
}, sideBySide);
|
||||
}
|
||||
|
||||
export function getBreakpointMessageAndClassName(debugService: IDebugService, textFileService: ITextFileService, breakpoint: IBreakpoint): { message: string, className: string } {
|
||||
const state = debugService.state;
|
||||
const debugActive = state === State.Running || state === State.Stopped;
|
||||
|
||||
if (!breakpoint.enabled || !debugService.getModel().areBreakpointsActivated()) {
|
||||
return {
|
||||
className: 'debug-breakpoint-disabled-glyph',
|
||||
message: nls.localize('breakpointDisabledHover', "Disabled Breakpoint"),
|
||||
};
|
||||
}
|
||||
|
||||
const appendMessage = (text: string): string => {
|
||||
return breakpoint.message ? text.concat(breakpoint.message) : text;
|
||||
};
|
||||
if (debugActive && !breakpoint.verified) {
|
||||
return {
|
||||
className: 'debug-breakpoint-unverified-glyph',
|
||||
message: appendMessage(nls.localize('breakpointUnverifieddHover', "Unverified Breakpoint")),
|
||||
};
|
||||
}
|
||||
|
||||
if (breakpoint instanceof FunctionBreakpoint) {
|
||||
// TODO@Isidor handle funciton breakpoints take into account if adapter supports function breakpoints
|
||||
}
|
||||
|
||||
if (debugActive && textFileService.isDirty(breakpoint.uri)) {
|
||||
return {
|
||||
className: 'debug-breakpoint-unverified-glyph',
|
||||
message: appendMessage(nls.localize('breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.")),
|
||||
};
|
||||
}
|
||||
|
||||
if (breakpoint.condition || breakpoint.hitCondition) {
|
||||
const process = debugService.getViewModel().focusedProcess;
|
||||
if (process && breakpoint.condition && !process.session.capabilities.supportsConditionalBreakpoints) {
|
||||
return {
|
||||
className: 'debug-breakpoint-unsupported-glyph',
|
||||
message: nls.localize('conditionalBreakpointUnsupported', "Conditional breakpoints not supported by this debug type"),
|
||||
};
|
||||
}
|
||||
if (process && breakpoint.hitCondition && !process.session.capabilities.supportsHitConditionalBreakpoints) {
|
||||
return {
|
||||
className: 'debug-breakpoint-unsupported-glyph',
|
||||
message: nls.localize('hitBreakpointUnsupported', "Hit conditional breakpoints not supported by this debug type"),
|
||||
};
|
||||
}
|
||||
|
||||
if (breakpoint.condition && breakpoint.hitCondition) {
|
||||
return {
|
||||
className: 'debug-breakpoint-conditional-glyph',
|
||||
message: appendMessage(`Expression: ${breakpoint.condition}\nHitCount: ${breakpoint.hitCondition}`)
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
className: 'debug-breakpoint-conditional-glyph',
|
||||
message: appendMessage(breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition)
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
className: 'debug-breakpoint-glyph',
|
||||
message: breakpoint.message
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as nls from 'vs/nls';
|
||||
import * as objects from 'vs/base/common/objects';
|
||||
import * as lifecycle from 'vs/base/common/lifecycle';
|
||||
import { Constants } from 'vs/editor/common/core/uint';
|
||||
import { Range } from 'vs/editor/common/core/range';
|
||||
|
|
@ -13,6 +11,8 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
|
|||
import { IDebugService, IBreakpoint, State } from 'vs/workbench/parts/debug/common/debug';
|
||||
import { IModelService } from 'vs/editor/common/services/modelService';
|
||||
import { MarkdownString } from 'vs/base/common/htmlContent';
|
||||
import { getBreakpointMessageAndClassName } from 'vs/workbench/parts/debug/browser/breakpointsView';
|
||||
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
|
||||
|
||||
interface IBreakpointDecoration {
|
||||
decorationId: string;
|
||||
|
|
@ -25,22 +25,20 @@ interface IDebugEditorModelData {
|
|||
toDispose: lifecycle.IDisposable[];
|
||||
breakpointDecorations: IBreakpointDecoration[];
|
||||
currentStackDecorations: string[];
|
||||
dirty: boolean;
|
||||
topStackFrameRange: Range;
|
||||
}
|
||||
|
||||
const stickiness = TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges;
|
||||
|
||||
export class DebugEditorModelManager implements IWorkbenchContribution {
|
||||
static readonly ID = 'breakpointManager';
|
||||
|
||||
static readonly STICKINESS = TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges;
|
||||
private modelDataMap: Map<string, IDebugEditorModelData>;
|
||||
private toDispose: lifecycle.IDisposable[];
|
||||
private ignoreDecorationsChangedEvent: boolean;
|
||||
|
||||
constructor(
|
||||
@IModelService private modelService: IModelService,
|
||||
@IDebugService private debugService: IDebugService
|
||||
@IDebugService private debugService: IDebugService,
|
||||
@ITextFileService private textFileService: ITextFileService
|
||||
) {
|
||||
this.modelDataMap = new Map<string, IDebugEditorModelData>();
|
||||
this.toDispose = [];
|
||||
|
|
@ -68,7 +66,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
|
|||
this.toDispose.push(this.debugService.onDidChangeState(state => {
|
||||
if (state === State.Inactive) {
|
||||
this.modelDataMap.forEach(modelData => {
|
||||
modelData.dirty = false;
|
||||
modelData.topStackFrameRange = undefined;
|
||||
});
|
||||
}
|
||||
|
|
@ -89,7 +86,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
|
|||
toDispose: toDispose,
|
||||
breakpointDecorations: breakpointDecorationIds.map((decorationId, index) => ({ decorationId, modelId: breakpoints[index].getId(), range: desiredDecorations[index].range })),
|
||||
currentStackDecorations: currentStackDecorations,
|
||||
dirty: false,
|
||||
topStackFrameRange: undefined
|
||||
});
|
||||
}
|
||||
|
|
@ -220,7 +216,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
|
|||
}
|
||||
}
|
||||
}
|
||||
modelData.dirty = this.debugService.state !== State.Inactive;
|
||||
|
||||
this.debugService.updateBreakpoints(modelUri, data, true);
|
||||
}
|
||||
|
|
@ -283,106 +278,52 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
|
|||
}
|
||||
|
||||
private getBreakpointDecorationOptions(breakpoint: IBreakpoint): IModelDecorationOptions {
|
||||
const activated = this.debugService.getModel().areBreakpointsActivated();
|
||||
const state = this.debugService.state;
|
||||
const debugActive = state === State.Running || state === State.Stopped;
|
||||
const modelData = this.modelDataMap.get(breakpoint.uri.toString());
|
||||
const { className, message } = getBreakpointMessageAndClassName(this.debugService, this.textFileService, breakpoint);
|
||||
let glyphMarginHoverMessage: MarkdownString;
|
||||
|
||||
let result = (!breakpoint.enabled || !activated) ? DebugEditorModelManager.BREAKPOINT_DISABLED_DECORATION :
|
||||
debugActive && modelData && modelData.dirty && !breakpoint.verified ? DebugEditorModelManager.BREAKPOINT_DIRTY_DECORATION :
|
||||
debugActive && !breakpoint.verified ? DebugEditorModelManager.BREAKPOINT_UNVERIFIED_DECORATION :
|
||||
!breakpoint.condition && !breakpoint.hitCondition ? DebugEditorModelManager.BREAKPOINT_DECORATION : null;
|
||||
|
||||
if (result) {
|
||||
result = objects.deepClone(result);
|
||||
if (breakpoint.message) {
|
||||
result.glyphMarginHoverMessage = new MarkdownString().appendText(breakpoint.message);
|
||||
if (message) {
|
||||
if (breakpoint.condition || breakpoint.hitCondition) {
|
||||
const modelData = this.modelDataMap.get(breakpoint.uri.toString());
|
||||
const modeId = modelData ? modelData.model.getLanguageIdentifier().language : '';
|
||||
glyphMarginHoverMessage = new MarkdownString().appendCodeblock(modeId, message);
|
||||
} else {
|
||||
glyphMarginHoverMessage = new MarkdownString().appendText(message);
|
||||
}
|
||||
if (breakpoint.column) {
|
||||
result.beforeContentClassName = `debug-breakpoint-column ${result.glyphMarginClassName}-column`;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
const process = this.debugService.getViewModel().focusedProcess;
|
||||
if (process && !process.session.capabilities.supportsConditionalBreakpoints) {
|
||||
return DebugEditorModelManager.BREAKPOINT_UNSUPPORTED_DECORATION;
|
||||
}
|
||||
|
||||
const modeId = modelData ? modelData.model.getLanguageIdentifier().language : '';
|
||||
let condition: string;
|
||||
if (breakpoint.condition && breakpoint.hitCondition) {
|
||||
condition = `Expression: ${breakpoint.condition}\nHitCount: ${breakpoint.hitCondition}`;
|
||||
} else {
|
||||
condition = breakpoint.condition ? breakpoint.condition : breakpoint.hitCondition;
|
||||
}
|
||||
const glyphMarginHoverMessage = new MarkdownString().appendCodeblock(modeId, condition);
|
||||
const glyphMarginClassName = 'debug-breakpoint-conditional-glyph';
|
||||
const beforeContentClassName = breakpoint.column ? `debug-breakpoint-column ${glyphMarginClassName}-column` : undefined;
|
||||
|
||||
return {
|
||||
glyphMarginClassName,
|
||||
glyphMarginClassName: className,
|
||||
glyphMarginHoverMessage,
|
||||
stickiness,
|
||||
beforeContentClassName
|
||||
stickiness: DebugEditorModelManager.STICKINESS,
|
||||
beforeContentClassName: breakpoint.column ? `debug-breakpoint-column ${className}-column` : undefined
|
||||
};
|
||||
}
|
||||
|
||||
// editor decorations
|
||||
|
||||
private static BREAKPOINT_DECORATION: IModelDecorationOptions = {
|
||||
glyphMarginClassName: 'debug-breakpoint-glyph',
|
||||
stickiness
|
||||
};
|
||||
|
||||
private static BREAKPOINT_DISABLED_DECORATION: IModelDecorationOptions = {
|
||||
glyphMarginClassName: 'debug-breakpoint-disabled-glyph',
|
||||
glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointDisabledHover', "Disabled Breakpoint")),
|
||||
stickiness
|
||||
};
|
||||
|
||||
private static BREAKPOINT_UNVERIFIED_DECORATION: IModelDecorationOptions = {
|
||||
glyphMarginClassName: 'debug-breakpoint-unverified-glyph',
|
||||
glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointUnverifieddHover', "Unverified Breakpoint")),
|
||||
stickiness
|
||||
};
|
||||
|
||||
private static BREAKPOINT_DIRTY_DECORATION: IModelDecorationOptions = {
|
||||
glyphMarginClassName: 'debug-breakpoint-unverified-glyph',
|
||||
glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.")),
|
||||
stickiness
|
||||
};
|
||||
|
||||
private static BREAKPOINT_UNSUPPORTED_DECORATION: IModelDecorationOptions = {
|
||||
glyphMarginClassName: 'debug-breakpoint-unsupported-glyph',
|
||||
glyphMarginHoverMessage: new MarkdownString().appendText(nls.localize('breakpointUnsupported', "Conditional breakpoints not supported by this debug type")),
|
||||
stickiness
|
||||
};
|
||||
|
||||
// we need a separate decoration for glyph margin, since we do not want it on each line of a multi line statement.
|
||||
private static TOP_STACK_FRAME_MARGIN: IModelDecorationOptions = {
|
||||
glyphMarginClassName: 'debug-top-stack-frame-glyph',
|
||||
stickiness
|
||||
stickiness: DebugEditorModelManager.STICKINESS
|
||||
};
|
||||
|
||||
private static FOCUSED_STACK_FRAME_MARGIN: IModelDecorationOptions = {
|
||||
glyphMarginClassName: 'debug-focused-stack-frame-glyph',
|
||||
stickiness
|
||||
stickiness: DebugEditorModelManager.STICKINESS
|
||||
};
|
||||
|
||||
private static TOP_STACK_FRAME_DECORATION: IModelDecorationOptions = {
|
||||
isWholeLine: true,
|
||||
inlineClassName: 'debug-remove-token-colors',
|
||||
className: 'debug-top-stack-frame-line',
|
||||
stickiness
|
||||
stickiness: DebugEditorModelManager.STICKINESS
|
||||
};
|
||||
|
||||
private static TOP_STACK_FRAME_EXCEPTION_DECORATION: IModelDecorationOptions = {
|
||||
isWholeLine: true,
|
||||
inlineClassName: 'debug-remove-token-colors',
|
||||
className: 'debug-top-stack-frame-exception-line',
|
||||
stickiness
|
||||
stickiness: DebugEditorModelManager.STICKINESS
|
||||
};
|
||||
|
||||
private static TOP_STACK_FRAME_INLINE_DECORATION: IModelDecorationOptions = {
|
||||
|
|
@ -393,6 +334,6 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
|
|||
isWholeLine: true,
|
||||
inlineClassName: 'debug-remove-token-colors',
|
||||
className: 'debug-focused-stack-frame-line',
|
||||
stickiness
|
||||
stickiness: DebugEditorModelManager.STICKINESS
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue