-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
134 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
src/yaxunit/features/TestStatusDecorator.ts → src/yaxunit/features/decorator.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { TestsModel } from "../TestDefinition"; | ||
|
|
||
| export interface TestModelRender{ | ||
| update(model: TestsModel): void | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| import { TestDefinition, TestsModel } from '../TestDefinition' | ||
| import { editor, MarkerSeverity } from 'monaco-editor' | ||
| import { TestModelRender } from './interfaces' | ||
|
|
||
|
|
||
| export class TestMessageMarkersProvider implements TestModelRender{ | ||
| editor: editor.IStandaloneCodeEditor | ||
| decorationsIds: editor.IEditorDecorationsCollection | undefined | ||
| constructor(editor: editor.IStandaloneCodeEditor) { | ||
| this.editor = editor | ||
| } | ||
|
|
||
| update(model: TestsModel): void { | ||
| const editorModel = this.editor.getModel() | ||
| if (!editorModel) { | ||
| return | ||
| } | ||
| const markers: editor.IMarkerData[] = this.getTestsMarkers(model, editorModel) | ||
| const errorsMarkers: editor.IMarkerData[] = this.getErrorsMarkers(model, editorModel) | ||
| markers.push(...errorsMarkers) | ||
| editor.setModelMarkers(editorModel, "owner", markers); | ||
| } | ||
|
|
||
| private getTestsMarkers(testsModel: TestsModel, editorModel: editor.ITextModel): editor.IMarkerData[] { | ||
| return testsModel.getTests().filter(t => t.message).map(t => { | ||
| return { | ||
| message: t.message ?? '', | ||
| severity: MarkerSeverity.Warning, | ||
| startLineNumber: t.lineNumber, | ||
| startColumn: editorModel.getLineFirstNonWhitespaceColumn(t.lineNumber), | ||
| endLineNumber: t.lineNumber, | ||
| endColumn: editorModel.getLineLastNonWhitespaceColumn(t.lineNumber) | ||
| } | ||
| }) | ||
| } | ||
| private getErrorsMarkers(testsModel: TestsModel, editorModel: editor.ITextModel): editor.IMarkerData[] { | ||
| return testsModel.getTests().filter(t => t.trace).map(t => getErrorMarker(t, editorModel)) | ||
| } | ||
| } | ||
|
|
||
| function getErrorMarker(test: TestDefinition, editorModel: editor.ITextModel): editor.IMarkerData { | ||
| const trace = parseTrace(test.trace ?? '', editorModel.getEOL()) | ||
| if (trace) { | ||
| return { | ||
| message: trace.message, | ||
| severity: MarkerSeverity.Error, | ||
| startLineNumber: trace.line, | ||
| startColumn: editorModel.getLineFirstNonWhitespaceColumn(trace.line), | ||
| endLineNumber: trace.line, | ||
| endColumn: editorModel.getLineLength(trace.line) | ||
| } | ||
| } else { | ||
| return { | ||
| message: test.trace??'', | ||
| severity: MarkerSeverity.Error, | ||
| startLineNumber: test.lineNumber, | ||
| startColumn: editorModel.getLineFirstNonWhitespaceColumn(test.lineNumber), | ||
| endLineNumber: test.lineNumber, | ||
| endColumn: editorModel.getLineLength(test.lineNumber) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function parseTrace(traceMessage: string, EOL:string) { | ||
| const lines = traceMessage.split(EOL) | ||
|
|
||
| let endLine = 0 | ||
| for (let index = lines.length - 1; index >= 0; index--) { | ||
| const line = lines[index]; | ||
| if (line.startsWith('{ВнешняяОбработка.')) { | ||
| endLine = index | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if (endLine) { | ||
| const match = /\((\d+)\)\}/.exec(lines[endLine]) | ||
| if (match) { | ||
| lines.length = endLine + 1 | ||
| return { | ||
| line: parseInt(match[1]), | ||
| message: lines.join('\n') | ||
| } | ||
| } | ||
| } | ||
| return undefined | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters