提交 53a0e27c 编写于 作者: R rsafronov

Fixed comments from @jrieken

上级 e19a65aa
......@@ -67,7 +67,7 @@ export interface ICommandHandler {
}
#include(vs/platform/contextkey/common/contextkey): IContextKey
#include(vs/editor/standalone/browser/standaloneServices): IEditorOverrideServices
#include(vs/platform/markers/common/markers): IMarkerData
#include(vs/platform/markers/common/markers): IMarker, IMarkerData
#include(vs/editor/standalone/browser/colorizer): IColorizerOptions, IColorizerElementOptions
#include(vs/base/common/scrollable): ScrollbarVisibility
#include(vs/platform/theme/common/themeService): ThemeColor
......
......@@ -19,7 +19,7 @@ import { Colorizer, IColorizerElementOptions, IColorizerOptions } from 'vs/edito
import { SimpleEditorService, SimpleEditorModelResolverService } from 'vs/editor/standalone/browser/simpleServices';
import * as modes from 'vs/editor/common/modes';
import { IWebWorkerOptions, MonacoWebWorker, createWebWorker as actualCreateWebWorker } from 'vs/editor/common/services/webWorker';
import { IMarkerData } from 'vs/platform/markers/common/markers';
import { IMarkerData, IMarker } from 'vs/platform/markers/common/markers';
import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
import { IEditorService } from 'vs/platform/editor/common/editor';
import { ICommandService } from 'vs/platform/commands/common/commands';
......@@ -199,7 +199,7 @@ export function setModelMarkers(model: editorCommon.IModel, owner: string, marke
* @returns {IMarkerData[]} list of markers
* @param filter
*/
export function getModelMarkers(filter: { owner?: string, resource?: URI, take?: number }): IMarkerData[] {
export function getModelMarkers(filter: { owner?: string, resource?: URI, take?: number }): IMarker[] {
return StaticServices.markerService.get().read(filter);
}
......
......@@ -842,7 +842,7 @@ declare module monaco.editor {
owner?: string;
resource?: Uri;
take?: number;
}): IMarkerData[];
}): IMarker[];
/**
* Get the model that has `uri` if it exists.
......@@ -1040,6 +1040,19 @@ declare module monaco.editor {
[index: string]: any;
}
export interface IMarker {
owner: string;
resource: Uri;
severity: Severity;
code?: string;
message: string;
source?: string;
startLineNumber: number;
startColumn: number;
endLineNumber: number;
endColumn: number;
}
/**
* A structure defining a problem/warning/etc.
*/
......
......@@ -9,8 +9,6 @@ import Severity from 'vs/base/common/severity';
import Event from 'vs/base/common/event';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
export const IMarkerService = createDecorator<IMarkerService>('markerService');
export interface IMarkerService {
_serviceBrand: any;
......@@ -114,3 +112,5 @@ export namespace IMarkerData {
return result.join('¦');
}
}
export const IMarkerService = createDecorator<IMarkerService>('markerService');
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册