Skip to content

Commit b62d4c1

Browse files
authored
fix: append model version id to marker (#432)
* fix: append model version id to marker * fix: append model version id to marker
1 parent 16a0bde commit b62d4c1

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

web/src/components/features/workspace/CodeEditor/syntaxcheck/checker.ts

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export class GoSyntaxChecker implements monaco.IDisposable {
5555
try {
5656
const response = await this.worker.checkSyntaxErrors({
5757
fileName,
58+
modelVersionId: model.getVersionId(),
5859
contents: model.getValue(),
5960
})
6061

web/src/components/features/workspace/CodeEditor/syntaxcheck/time.ts

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export const getTimeNowUsageMarkers = (model: monaco.editor.ITextModel): monaco.
3434
value: 'More information',
3535
target: issueUrl,
3636
},
37+
modelVersionId: model.getVersionId(),
3738
severity: monaco.MarkerSeverity.Warning,
3839
message: timeNowUsageWarning,
3940
startLineNumber: lineNumber,

web/src/workers/analyzer/analyzer.worker.ts

+11-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ import type { AnalyzeRequest, AnalyzeResponse } from './types'
44

55
// TODO: refactor this together with the Go worker API
66

7+
const appendModelVersion = (markers: AnalyzeResponse['markers'], modelVersionId: number) => {
8+
if (!markers) {
9+
return null
10+
}
11+
12+
return markers.map((marker) => ({ ...marker, modelVersionId }))
13+
}
14+
715
export class WorkerHandler {
816
private mod?: WrappedGoModule
917
private readonly initPromise = startAnalyzer()
@@ -13,12 +21,13 @@ export class WorkerHandler {
1321
return this.mod
1422
}
1523

16-
async checkSyntaxErrors({ fileName, contents }: AnalyzeRequest): Promise<AnalyzeResponse> {
24+
async checkSyntaxErrors({ fileName, modelVersionId, contents }: AnalyzeRequest): Promise<AnalyzeResponse> {
1725
const mod = await this.getModule()
1826
const { markers } = await mod.analyzeCode(contents)
1927
return {
2028
fileName,
21-
markers,
29+
modelVersionId,
30+
markers: appendModelVersion(markers, modelVersionId),
2231
}
2332
}
2433
}

web/src/workers/analyzer/types.ts

+2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ import type * as monaco from 'monaco-editor'
33
export interface AnalyzeRequest {
44
fileName: string
55
contents: string
6+
modelVersionId: number
67
}
78

89
export interface AnalyzeResponse {
910
fileName: string
11+
modelVersionId: number
1012
markers: monaco.editor.IMarkerData[] | null
1113
}

0 commit comments

Comments
 (0)