Skip to content
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.

Sign up for GitHub

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

refactor(repl): use SWC lexer to highlight and validate #8496

Merged
merged 9 commits into from
Nov 27, 2020
Merged

refactor(repl): use SWC lexer to highlight and validate #8496

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c0e9c4a
feat(cli/repl): use SWC to highlight/validate REPL
Liamolucko Nov 26, 2020
c09824c
Fix lint error
Liamolucko Nov 26, 2020
f8452ac
fix lint more
Liamolucko Nov 26, 2020
fa09a06
Remove `swc_atoms` dependency
Liamolucko Nov 27, 2020
e3d3351
Create `ast::lex()`
Liamolucko Nov 27, 2020
916c5b4
fmt
Liamolucko Nov 27, 2020
f670951
fix: Highlight BigInts
Liamolucko Nov 27, 2020
dd9e5a2
Merge branch 'master' into swc-repl-highlighter
bartlomieju Nov 27, 2020
68b5b10
revert changes to Cargo.lock
bartlomieju Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fmt
  • Loading branch information
@Liamolucko
Liamolucko committed Nov 27, 2020
commit 916c5b40dcb374c7004632f61300182120415b95
14 changes: 6 additions & 8 deletions cli/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,14 +460,12 @@ pub fn lex(
})
.collect();

tokens.extend(flatten_comments(comments).map(|comment| {
LexedItem {
span: comment.span,
inner: TokenOrComment::Comment {
kind: comment.kind,
text: comment.text,
},
}
tokens.extend(flatten_comments(comments).map(|comment| LexedItem {
span: comment.span,
inner: TokenOrComment::Comment {
kind: comment.kind,
text: comment.text,
},
}));

tokens.sort_by_key(|item| item.span.lo.0);
Expand Down