Skip to content

V
vscode

掘金者说 / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 c022d638 编写于 作者: I isidor
浏览文件
操作

debug: move debugEditorContribution to own file.

上级 45c9a93d
隐藏空白更改
内联 并排
Showing with 161 addition and 157 deletion
src/vs/workbench/parts/debug/browser/debug.contribution.ts
浏览文件 @ c022d638
......@@ -5,36 +5,28 @@
import 'vs/css!./media/debug.contribution';
import nls = require('vs/nls');
import env = require('vs/base/common/platform');
import lifecycle = require('vs/base/common/lifecycle');
import keyboard = require('vs/base/browser/keyboardEvent');
import editorbrowser = require('vs/editor/browser/editorBrowser');
import editorcommon = require('vs/editor/common/editorCommon');
import { EditorBrowserRegistry } from 'vs/editor/browser/editorBrowserExtensions';
import { CommonEditorRegistry, ContextKey, EditorActionDescriptor } from 'vs/editor/common/editorCommonExtensions';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import platform = require('vs/platform/platform');
import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry';
import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { IKeybindings } from 'vs/platform/keybinding/common/keybindingService';
import { EditorBrowserRegistry } from 'vs/editor/browser/editorBrowserExtensions';
import wbaregistry = require('vs/workbench/browser/actionRegistry');
import actionbarregistry = require('vs/workbench/browser/actionBarRegistry');
import viewlet = require('vs/workbench/browser/viewlet');
import wbext = require('vs/workbench/common/contributions');
import files = require('vs/workbench/parts/files/browser/files');
import baseeditor = require('vs/workbench/browser/parts/editor/baseEditor');
import filesCommon = require('vs/workbench/parts/files/common/files');
import manager = require('vs/workbench/parts/debug/browser/debugEditorModelManager');
import * as debug from 'vs/workbench/parts/debug/common/debug';
import { DebugEditorModelManager } from 'vs/workbench/parts/debug/browser/debugEditorModelManager'
import dbgactions = require('vs/workbench/parts/debug/browser/debugActions');
import editorinputs = require('vs/workbench/parts/debug/browser/debugEditorInputs');
import repleditor = require('vs/workbench/parts/debug/browser/replEditor');
import debugwidget = require('vs/workbench/parts/debug/browser/debugActionsWidget');
import debughover = require('vs/workbench/parts/debug/browser/debugHoverWidget');
import { IKeybindings } from 'vs/platform/keybinding/common/keybindingService';
import { DebugEditorContribution } from 'vs/workbench/parts/debug/browser/debugEditorContribution';
import { IViewletService } from 'vs/workbench/services/viewlet/common/viewletService';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common/contextService';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import IDebugService = debug.IDebugService;
......@@ -52,148 +44,7 @@ class OpenDebugViewletAction extends viewlet.ToggleViewletAction {
}
}
class DebugEditorContrib implements editorcommon.IEditorContribution {
static ID = 'editor.contrib.debug';
private editor: editorbrowser.ICodeEditor;
private toDispose: lifecycle.IDisposable[];
private breakpointHintDecoration: string[];
private hoverWidget: debughover.DebugHoverWidget;
constructor(edtr: editorbrowser.ICodeEditor,
@IDebugService private debugService: IDebugService,
@IWorkspaceContextService private contextService: IWorkspaceContextService
) {
this.editor = edtr;
this.breakpointHintDecoration = [];
this.toDispose = [];
this.registerListeners();
this.hoverWidget = new debughover.DebugHoverWidget(this.editor, this.debugService);
}
private registerListeners(): void {
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseDown, (e: editorbrowser.IMouseEvent) => {
if (e.target.type !== editorcommon.MouseTargetType.GUTTER_GLYPH_MARGIN || /* after last line */ e.target.detail) {
return;
}
if (!this.debugService.canSetBreakpointsIn(this.editor.getModel(), e.target.position.lineNumber)) {
return;
}
var modelUrl = this.editor.getModel().getAssociatedResource();
this.debugService.toggleBreakpoint(modelUrl, e.target.position.lineNumber);
}));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseMove, (e: editorbrowser.IMouseEvent) => {
var showBreakpointHintAtLineNumber = -1;
if (e.target.type === editorcommon.MouseTargetType.GUTTER_GLYPH_MARGIN && this.debugService.canSetBreakpointsIn(this.editor.getModel(), e.target.position.lineNumber)) {
if (!e.target.detail) {
// is not after last line
showBreakpointHintAtLineNumber = e.target.position.lineNumber;
}
}
this.ensureBreakpointHintDecoration(showBreakpointHintAtLineNumber);
}));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseLeave, (e: editorbrowser.IMouseEvent) => {
this.ensureBreakpointHintDecoration(-1);
}));
this.toDispose.push(this.debugService.addListener2(debug.ServiceEvents.STATE_CHANGED, () => this.onDebugStateUpdate()));
// hover listeners & hover widget
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseDown, (e: editorbrowser.IMouseEvent) => this.onEditorMouseDown(e)));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseMove, (e: editorbrowser.IMouseEvent) => this.onEditorMouseMove(e)));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseLeave, (e: editorbrowser.IMouseEvent) => this.hoverWidget.hide()));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.KeyDown, (e: keyboard.StandardKeyboardEvent) => this.onKeyDown(e)));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.ModelChanged, () => this.onModelChanged()));
this.toDispose.push(this.editor.addListener2('scroll', () => this.hoverWidget.hide()));
}
public getId(): string {
return DebugEditorContrib.ID;
}
private ensureBreakpointHintDecoration(showBreakpointHintAtLineNumber: number): void {
var newDecoration: editorcommon.IModelDeltaDecoration[] = [];
if (showBreakpointHintAtLineNumber !== -1) {
newDecoration.push({
options: DebugEditorContrib.BREAKPOINT_HELPER_DECORATION,
range: {
startLineNumber: showBreakpointHintAtLineNumber,
startColumn: 1,
endLineNumber: showBreakpointHintAtLineNumber,
endColumn: 1
}
});
}
this.breakpointHintDecoration = this.editor.deltaDecorations(this.breakpointHintDecoration, newDecoration);
}
private onDebugStateUpdate(): void {
if (this.debugService.getState() !== debug.State.Stopped) {
this.hoverWidget.hide();
}
this.contextService.updateOptions('editor', {
hover: this.debugService.getState() !== debug.State.Stopped
});
}
private onModelChanged(): void {
this.hoverWidget.hide();
}
// hover business
private onEditorMouseDown(mouseEvent: editorbrowser.IMouseEvent): void {
var targetType = mouseEvent.target.type;
if (targetType === editorcommon.MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === debughover.DebugHoverWidget.ID) {
return;
}
this.hoverWidget.hide();
}
private onEditorMouseMove(mouseEvent: editorbrowser.IMouseEvent): void {
if (this.debugService.getState() !== debug.State.Stopped) {
return;
}
var targetType = mouseEvent.target.type;
var stopKey = env.isMacintosh ? 'metaKey' : 'ctrlKey';
if (targetType === editorcommon.MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === debughover.DebugHoverWidget.ID && !(<any>mouseEvent.event)[stopKey]) {
// mouse moved on top of content hover widget
return;
}
if (targetType === editorcommon.MouseTargetType.CONTENT_TEXT) {
this.hoverWidget.showAt(mouseEvent.target.range);
} else {
this.hoverWidget.hide();
}
}
private onKeyDown(e: keyboard.StandardKeyboardEvent): void {
var stopKey = env.isMacintosh ? KeyCode.Meta : KeyCode.Ctrl;
if (e.keyCode !== stopKey) {
// Do not hide hover when Ctrl/Meta is pressed
this.hoverWidget.hide();
}
}
// end hover business
private static BREAKPOINT_HELPER_DECORATION: editorcommon.IModelDecorationOptions = {
glyphMarginClassName: 'debug-breakpoint-glyph-hint',
stickiness: editorcommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
};
public dispose(): void {
this.toDispose = lifecycle.disposeAll(this.toDispose);
}
}
EditorBrowserRegistry.registerEditorContribution(DebugEditorContrib);
EditorBrowserRegistry.registerEditorContribution(DebugEditorContribution);
CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(dbgactions.ToggleBreakpointAction, dbgactions.ToggleBreakpointAction.ID, nls.localize('toggleBreakpointAction', "Debug: Toggle Breakpoint"), {
context: ContextKey.EditorTextFocus,
primary: KeyCode.F9
......@@ -229,7 +80,7 @@ actionBarRegistry.registerActionBarContributor(actionbarregistry.Scope.EDITOR, r
var registry = (<wbaregistry.IWorkbenchActionRegistry> platform.Registry.as(wbaregistry.Extensions.WorkbenchActions));
registry.registerWorkbenchAction(new SyncActionDescriptor(OpenDebugViewletAction, OpenDebugViewletAction.ID, OpenDebugViewletAction.LABEL, openViewletKb), nls.localize('view', "View"));
(<wbext.IWorkbenchContributionsRegistry>platform.Registry.as(wbext.Extensions.Workbench)).registerWorkbenchContribution(manager.DebugEditorModelManager);
(<wbext.IWorkbenchContributionsRegistry>platform.Registry.as(wbext.Extensions.Workbench)).registerWorkbenchContribution(DebugEditorModelManager);
(<wbext.IWorkbenchContributionsRegistry>platform.Registry.as(wbext.Extensions.Workbench)).registerWorkbenchContribution(debugwidget.DebugActionsWidget);
var debugCategory = nls.localize('debugCategory', "Debug");
......
src/vs/workbench/parts/debug/browser/debugEditorContribution.ts 0 → 100644
浏览文件 @ c022d638
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import lifecycle = require('vs/base/common/lifecycle');
import env = require('vs/base/common/platform');
import { KeyCode } from 'vs/base/common/keyCodes';
import keyboard = require('vs/base/browser/keyboardEvent');
import editorbrowser = require('vs/editor/browser/editorBrowser');
import editorcommon = require('vs/editor/common/editorCommon');
import { DebugHoverWidget } from 'vs/workbench/parts/debug/browser/debugHoverWidget';
import debug = require('vs/workbench/parts/debug/common/debug');
import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common/contextService';
export class DebugEditorContribution implements editorcommon.IEditorContribution {
static ID = 'editor.contrib.debug';
private toDispose: lifecycle.IDisposable[];
private breakpointHintDecoration: string[];
private hoverWidget: DebugHoverWidget;
constructor(
private editor: editorbrowser.ICodeEditor,
@debug.IDebugService private debugService: debug.IDebugService,
@IWorkspaceContextService private contextService: IWorkspaceContextService
) {
this.breakpointHintDecoration = [];
this.toDispose = [];
this.hoverWidget = new DebugHoverWidget(this.editor, this.debugService);
this.registerListeners();
}
private registerListeners(): void {
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseDown, (e: editorbrowser.IMouseEvent) => {
if (e.target.type !== editorcommon.MouseTargetType.GUTTER_GLYPH_MARGIN || /* after last line */ e.target.detail) {
return;
}
if (!this.debugService.canSetBreakpointsIn(this.editor.getModel(), e.target.position.lineNumber)) {
return;
}
var modelUrl = this.editor.getModel().getAssociatedResource();
this.debugService.toggleBreakpoint(modelUrl, e.target.position.lineNumber);
}));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseMove, (e: editorbrowser.IMouseEvent) => {
var showBreakpointHintAtLineNumber = -1;
if (e.target.type === editorcommon.MouseTargetType.GUTTER_GLYPH_MARGIN && this.debugService.canSetBreakpointsIn(this.editor.getModel(), e.target.position.lineNumber)) {
if (!e.target.detail) {
// is not after last line
showBreakpointHintAtLineNumber = e.target.position.lineNumber;
}
}
this.ensureBreakpointHintDecoration(showBreakpointHintAtLineNumber);
}));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseLeave, (e: editorbrowser.IMouseEvent) => {
this.ensureBreakpointHintDecoration(-1);
}));
this.toDispose.push(this.debugService.addListener2(debug.ServiceEvents.STATE_CHANGED, () => this.onDebugStateUpdate()));
// hover listeners & hover widget
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseDown, (e: editorbrowser.IMouseEvent) => this.onEditorMouseDown(e)));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseMove, (e: editorbrowser.IMouseEvent) => this.onEditorMouseMove(e)));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.MouseLeave, (e: editorbrowser.IMouseEvent) => this.hoverWidget.hide()));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.KeyDown, (e: keyboard.StandardKeyboardEvent) => this.onKeyDown(e)));
this.toDispose.push(this.editor.addListener2(editorcommon.EventType.ModelChanged, () => this.onModelChanged()));
this.toDispose.push(this.editor.addListener2('scroll', () => this.hoverWidget.hide()));
}
public getId(): string {
return DebugEditorContribution.ID;
}
private ensureBreakpointHintDecoration(showBreakpointHintAtLineNumber: number): void {
var newDecoration: editorcommon.IModelDeltaDecoration[] = [];
if (showBreakpointHintAtLineNumber !== -1) {
newDecoration.push({
options: DebugEditorContribution.BREAKPOINT_HELPER_DECORATION,
range: {
startLineNumber: showBreakpointHintAtLineNumber,
startColumn: 1,
endLineNumber: showBreakpointHintAtLineNumber,
endColumn: 1
}
});
}
this.breakpointHintDecoration = this.editor.deltaDecorations(this.breakpointHintDecoration, newDecoration);
}
private onDebugStateUpdate(): void {
if (this.debugService.getState() !== debug.State.Stopped) {
this.hoverWidget.hide();
}
this.contextService.updateOptions('editor', {
hover: this.debugService.getState() !== debug.State.Stopped
});
}
private onModelChanged(): void {
this.hoverWidget.hide();
}
// hover business
private onEditorMouseDown(mouseEvent: editorbrowser.IMouseEvent): void {
if (mouseEvent.target.type === editorcommon.MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === DebugHoverWidget.ID) {
return;
}
this.hoverWidget.hide();
}
private onEditorMouseMove(mouseEvent: editorbrowser.IMouseEvent): void {
if (this.debugService.getState() !== debug.State.Stopped) {
return;
}
const targetType = mouseEvent.target.type;
const stopKey = env.isMacintosh ? 'metaKey' : 'ctrlKey';
if (targetType === editorcommon.MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === DebugHoverWidget.ID && !(<any>mouseEvent.event)[stopKey]) {
// mouse moved on top of content hover widget
return;
}
if (targetType === editorcommon.MouseTargetType.CONTENT_TEXT) {
this.hoverWidget.showAt(mouseEvent.target.range);
} else {
this.hoverWidget.hide();
}
}
private onKeyDown(e: keyboard.StandardKeyboardEvent): void {
const stopKey = env.isMacintosh ? KeyCode.Meta : KeyCode.Ctrl;
if (e.keyCode !== stopKey) {
// Do not hide hover when Ctrl/Meta is pressed
this.hoverWidget.hide();
}
}
// end hover business
private static BREAKPOINT_HELPER_DECORATION: editorcommon.IModelDecorationOptions = {
glyphMarginClassName: 'debug-breakpoint-glyph-hint',
stickiness: editorcommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
};
public dispose(): void {
this.toDispose = lifecycle.disposeAll(this.toDispose);
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或