-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
chore: align warning and error objects, add frame property #12326
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 @@ | ||
| --- | ||
| 'svelte': patch | ||
| --- | ||
|
|
||
| chore: align warning and error objects, add frame property |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
105 changes: 105 additions & 0 deletions
105
packages/svelte/src/compiler/utils/compile_diagnostic.js
This file contains hidden or 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,105 @@ | ||
| /** @import { Location } from 'locate-character' */ | ||
| import * as state from '../state.js'; | ||
|
|
||
| const regex_tabs = /^\t+/; | ||
|
|
||
| /** | ||
| * @param {string} str | ||
| */ | ||
| function tabs_to_spaces(str) { | ||
| return str.replace(regex_tabs, (match) => match.split('\t').join(' ')); | ||
| } | ||
|
|
||
| /** | ||
| * @param {string} source | ||
| * @param {number} line | ||
| * @param {number} column | ||
| */ | ||
| function get_code_frame(source, line, column) { | ||
| const lines = source.split('\n'); | ||
| const frame_start = Math.max(0, line - 2); | ||
| const frame_end = Math.min(line + 3, lines.length); | ||
| const digits = String(frame_end + 1).length; | ||
| return lines | ||
| .slice(frame_start, frame_end) | ||
| .map((str, i) => { | ||
| const is_error_line = frame_start + i === line; | ||
| const line_num = String(i + frame_start + 1).padStart(digits, ' '); | ||
| if (is_error_line) { | ||
| const indicator = | ||
| ' '.repeat(digits + 2 + tabs_to_spaces(str.slice(0, column)).length) + '^'; | ||
| return `${line_num}: ${tabs_to_spaces(str)}\n${indicator}`; | ||
| } | ||
| return `${line_num}: ${tabs_to_spaces(str)}`; | ||
| }) | ||
| .join('\n'); | ||
| } | ||
|
|
||
| /** | ||
| * @typedef {{ | ||
| * code: string; | ||
| * message: string; | ||
| * filename?: string; | ||
| * start?: Location; | ||
| * end?: Location; | ||
| * position?: [number, number]; | ||
| * frame?: string; | ||
| * }} ICompileDiagnostic */ | ||
|
|
||
| /** @implements {ICompileDiagnostic} */ | ||
| export class CompileDiagnostic extends Error { | ||
| name = 'CompileDiagnostic'; | ||
|
|
||
| /** | ||
| * @param {string} code | ||
| * @param {string} message | ||
| * @param {[number, number] | undefined} position | ||
| */ | ||
| constructor(code, message, position) { | ||
| super(message); | ||
| this.code = code; | ||
|
|
||
| if (state.filename) { | ||
| this.filename = state.filename; | ||
| } | ||
|
|
||
| if (position) { | ||
| this.position = position; | ||
| this.start = state.locator(position[0]); | ||
| this.end = state.locator(position[1]); | ||
| if (this.start && this.end) { | ||
| this.frame = get_code_frame(state.source, this.start.line - 1, this.end.column); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| toString() { | ||
| let out = `${this.code}: ${this.message}`; | ||
|
|
||
| if (this.filename) { | ||
| out += `\n${this.filename}`; | ||
|
|
||
| if (this.start) { | ||
| out += `:${this.start.line}:${this.start.column}`; | ||
| } | ||
| } | ||
|
|
||
| if (this.frame) { | ||
| out += `\n${this.frame}`; | ||
| } | ||
|
|
||
| return out; | ||
| } | ||
|
|
||
| toJSON() { | ||
| return { | ||
| code: this.code, | ||
| message: this.message, | ||
| filename: this.filename, | ||
| start: this.start, | ||
| end: this.end, | ||
| position: this.position, | ||
| frame: this.frame | ||
| }; | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
side note: I would've called this "CompilerError" (note the additional r). Is "compile error" more correct? I stumble over that mentally each time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error is comming from the compiler, so I would call it a CompilerError. Not meaning there is something is wrong with the compiler, but the an error has been raised from compiler. thoughts?