Skip to content

Commit

Permalink
Use end-of-file as fallback position for exceptions
Browse files Browse the repository at this point in the history
Some reader exceptions do not have position information. This uses end-of-file
as a reasonable guess, so we can at least highlight some part of the file.
Handing this case resolves a langserver contract error.

Fixes jeapostrophe#102
  • Loading branch information
jryans committed Apr 7, 2023
1 parent fc37990 commit 550378f
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions check-syntax.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"autocomplete.rkt"
"doc-trace.rkt")

(define ((error-diagnostics src) exn)
(define ((error-diagnostics doc-text) exn)
(define msg (exn-message exn))
(cond
;; typed racket support: don't report error summaries
Expand All @@ -25,11 +25,20 @@
(define srclocs ((exn:srclocs-accessor exn) exn))
(for/list ([sl (in-list srclocs)])
(match-define (srcloc src line col pos span) sl)
(Diagnostic #:range (Range #:start (Pos #:line (sub1 line) #:char col)
#:end (Pos #:line (sub1 line) #:char (+ col span)))
#:severity Diag-Error
#:source "Racket"
#:message msg))]
(if (and (number? line) (number? col) (number? span))
(Diagnostic #:range (Range #:start (Pos #:line (sub1 line) #:char col)
#:end (Pos #:line (sub1 line) #:char (+ col span)))
#:severity Diag-Error
#:source "Racket"
#:message msg)
;; Some reader exceptions don't report a position
;; Use end of file as a reasonable guess
(let ([end-of-file (abs-pos->Pos doc-text (send doc-text last-position))])
(Diagnostic #:range (Range #:start end-of-file
#:end end-of-file)
#:severity Diag-Error
#:source "Racket"
#:message msg))))]
[(exn:missing-module? exn)
;; Hack:
;; We do not have any source location for the offending `require`, but the language
Expand Down Expand Up @@ -109,7 +118,7 @@
(when (list? result) (set! diags (append diags result))))
(lambda ()
(with-handlers ([(or/c exn:fail:read? exn:fail:syntax? exn:fail:filesystem?)
(error-diagnostics src)])
(error-diagnostics doc-text)])
(define stx (expand (with-module-reading-parameterization
(λ () (read-syntax src in)))))
;; reading and expanding succeeded, clear out any syntax errors before the
Expand Down

0 comments on commit 550378f

Please sign in to comment.