Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-25 17:57:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

navigatable related diagnostics in F8, #10271

Browse Source
This commit is contained in:
Johannes Rieken
2018-03-20 11:35:28 +01:00
parent 12481101d6
commit a42101eecc
3 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/gotoError/gotoError.ts
+3 -2
View File
@@ -201,7 +201,8 @@ class MarkerController implements editorCommon.IEditorContribution {
editor: ICodeEditor,
@IMarkerService private readonly _markerService: IMarkerService,
@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@IThemeService private readonly _themeService: IThemeService
@IThemeService private readonly _themeService: IThemeService,
@IEditorService private readonly _editorService: IEditorService
) {
this._editor = editor;
this._widgetVisible = CONTEXT_MARKERS_NAVIGATION_VISIBLE.bindTo(this._contextKeyService);
@@ -232,7 +233,7 @@ class MarkerController implements editorCommon.IEditorContribution {
this._model = new MarkerModel(this._editor, markers);
this._markerService.onMarkerChanged(this._onMarkerChanged, this, this._disposeOnClose);
this._widget = new MarkerNavigationWidget(this._editor, this._themeService);
this._widget = new MarkerNavigationWidget(this._editor, this._themeService, this._editorService);
this._widgetVisible.set(true);
this._disposeOnClose.push(this._model);
src/vs/editor/contrib/gotoError/gotoErrorWidget.css
+5
View File
@@ -32,3 +32,8 @@
-webkit-user-select: text;
user-select: text;
}
.monaco-editor .marker-widget .descriptioncontainer .filename {
cursor: pointer;
opacity: 0.6;
}
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
+59 -16
View File
@@ -9,7 +9,7 @@ import 'vs/css!./gotoErrorWidget';
import * as nls from 'vs/nls';
import * as dom from 'vs/base/browser/dom';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IMarker, MarkerSeverity } from 'vs/platform/markers/common/markers';
import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/markers/common/markers';
import { Position } from 'vs/editor/common/core/position';
import { Range } from 'vs/editor/common/core/range';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -22,7 +22,10 @@ import { editorErrorForeground, editorErrorBorder, editorWarningForeground, edit
import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { ScrollType } from 'vs/editor/common/editorCommon';
import { basename } from 'vs/base/common/paths';
import { getBaseLabel } from 'vs/base/common/labels';
import { IEditorService } from 'vs/platform/editor/common/editor';
import { onUnexpectedError } from 'vs/base/common/errors';
import { isFalsyOrEmpty } from 'vs/base/common/arrays';
class MessageWidget {
@@ -30,19 +33,37 @@ class MessageWidget {
longestLineLength: number = 0;
private readonly _editor: ICodeEditor;
private readonly _domNode: HTMLElement;
private readonly _messageBlock: HTMLSpanElement;
private readonly _relatedBlock: HTMLSpanElement;
private readonly _scrollable: ScrollableElement;
private readonly _relatedDiagnostics = new WeakMap<HTMLElement, IRelatedInformation>();
private readonly _disposables: IDisposable[] = [];
constructor(parent: HTMLElement, editor: ICodeEditor) {
constructor(parent: HTMLElement, editor: ICodeEditor, editorService: IEditorService) {
this._editor = editor;
this._domNode = document.createElement('span');
this._domNode.className = 'descriptioncontainer';
this._domNode.setAttribute('aria-live', 'assertive');
this._domNode.setAttribute('role', 'alert');
const domNode = document.createElement('div');
domNode.className = 'descriptioncontainer';
domNode.setAttribute('aria-live', 'assertive');
domNode.setAttribute('role', 'alert');
this._scrollable = new ScrollableElement(this._domNode, {
this._messageBlock = document.createElement('span');
domNode.appendChild(this._messageBlock);
this._relatedBlock = document.createElement('div');
domNode.appendChild(this._relatedBlock);
this._disposables.push(dom.addStandardDisposableListener(this._relatedBlock, 'click', event => {
event.preventDefault();
const related = this._relatedDiagnostics.get(event.target);
if (related) {
editorService.openEditor({
resource: related.resource,
options: { pinned: true, revealIfOpened: true, selection: Range.lift(related).collapseToStart() }
}).then(undefined, onUnexpectedError);
}
}));
this._scrollable = new ScrollableElement(domNode, {
horizontal: ScrollbarVisibility.Auto,
vertical: ScrollbarVisibility.Hidden,
useShadows: false,
@@ -50,7 +71,7 @@ class MessageWidget {
});
dom.addClass(this._scrollable.getDomNode(), 'block');
parent.appendChild(this._scrollable.getDomNode());
this._disposables.push(this._scrollable.onScroll(e => this._domNode.style.left = `-${e.scrollLeft}px`));
this._disposables.push(this._scrollable.onScroll(e => domNode.style.left = `-${e.scrollLeft}px`));
this._disposables.push(this._scrollable);
}
@@ -80,15 +101,35 @@ class MessageWidget {
this.longestLineLength = message.length;
}
if (Array.isArray(relatedInformation)) {
dom.clearNode(this._relatedBlock);
if (!isFalsyOrEmpty(relatedInformation)) {
this._relatedBlock.style.paddingTop = `${Math.floor(this._editor.getConfiguration().lineHeight * .66)}px`;
this.lines += 1;
for (const related of relatedInformation) {
let container = document.createElement('div');
let relatedResource = document.createElement('span');
dom.addClass(relatedResource, 'filename');
relatedResource.innerHTML = `${getBaseLabel(related.resource)}(${related.startLineNumber}, ${related.startColumn}) &ndash; `;
this._relatedDiagnostics.set(relatedResource, related);
let relatedMessage = document.createElement('span');
relatedMessage.innerText = related.message;
this._editor.applyFontInfo(relatedMessage);
container.appendChild(relatedResource);
container.appendChild(relatedMessage);
this.lines += 1;
message += `\n${related.message} - ${basename(related.resource.path)}:${related.startLineNumber}`;
this._relatedBlock.appendChild(container);
}
}
this._domNode.innerText = message;
this._editor.applyFontInfo(this._domNode);
this._messageBlock.innerText = message;
this._editor.applyFontInfo(this._messageBlock);
const width = Math.floor(this._editor.getConfiguration().fontInfo.typicalFullwidthCharacterWidth * this.longestLineLength);
this._scrollable.setScrollDimensions({ scrollWidth: width });
}
@@ -110,7 +151,8 @@ export class MarkerNavigationWidget extends ZoneWidget {
constructor(
editor: ICodeEditor,
private _themeService: IThemeService
private _themeService: IThemeService,
private _editorService: IEditorService
) {
super(editor, { showArrow: true, showFrame: true, isAccessible: true });
this._severity = MarkerSeverity.Warning;
@@ -166,7 +208,7 @@ export class MarkerNavigationWidget extends ZoneWidget {
this._title.className = 'block title';
this._container.appendChild(this._title);
this._message = new MessageWidget(this._container, this.editor);
this._message = new MessageWidget(this._container, this.editor, this._editorService);
this._disposables.push(this._message);
}
@@ -210,6 +252,7 @@ export class MarkerNavigationWidget extends ZoneWidget {
protected _doLayout(heightInPixel: number, widthInPixel: number): void {
this._message.layout(heightInPixel, widthInPixel);
this._container.style.height = `${heightInPixel}px`;
}
protected _relayout(): void {