RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:07:44 +00:00
Code Issues Activity Actions

Userland/js: Prompt for more input on labels and object keys

Browse source 
Closes #2452
This commit is contained in:
AnotherTest 2020-05-30 21:42:11 +04:30 • committed by Andreas Kling
parent ca6fbefbc9
commit 4aa3d08e21
1 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Userland/js.cpp
View file

@ -86,9 +86,13 @@ String read_next_piece()
{ {
StringBuilder piece; StringBuilder piece;
auto line_level_delta_for_next_line { 0 };
do { do {
auto line_result = s_editor->get_line(prompt_for_level(s_repl_line_level)); auto line_result = s_editor->get_line(prompt_for_level(s_repl_line_level));
line_level_delta_for_next_line = 0;
if (line_result.is_error()) { if (line_result.is_error()) {
s_fail_repl = true; s_fail_repl = true;
return ""; return "";
@ -100,23 +104,51 @@ String read_next_piece()
piece.append(line); piece.append(line);
auto lexer = JS::Lexer(line); auto lexer = JS::Lexer(line);
enum {
NotInLabelOrObjectKey,
InLabelOrObjectKeyIdentifier,
InLabelOrObjectKey
} label_state { NotInLabelOrObjectKey };
for (JS::Token token = lexer.next(); token.type() != JS::TokenType::Eof; token = lexer.next()) { for (JS::Token token = lexer.next(); token.type() != JS::TokenType::Eof; token = lexer.next()) {
switch (token.type()) { switch (token.type()) {
case JS::TokenType::BracketOpen: case JS::TokenType::BracketOpen:
case JS::TokenType::CurlyOpen: case JS::TokenType::CurlyOpen:
case JS::TokenType::ParenOpen: case JS::TokenType::ParenOpen:
label_state = NotInLabelOrObjectKey;
s_repl_line_level++; s_repl_line_level++;
break; break;
case JS::TokenType::BracketClose: case JS::TokenType::BracketClose:
case JS::TokenType::CurlyClose: case JS::TokenType::CurlyClose:
case JS::TokenType::ParenClose: case JS::TokenType::ParenClose:
label_state = NotInLabelOrObjectKey;
s_repl_line_level--; s_repl_line_level--;
break; break;
case JS::TokenType::Identifier:
case JS::TokenType::StringLiteral:
if (label_state == NotInLabelOrObjectKey)
label_state = InLabelOrObjectKeyIdentifier;
else
label_state = NotInLabelOrObjectKey;
break;
case JS::TokenType::Colon:
if (label_state == InLabelOrObjectKeyIdentifier)
label_state = InLabelOrObjectKey;
else
label_state = NotInLabelOrObjectKey;
break;
default: default:
break; break;
} }
} }
} while (s_repl_line_level > 0);
if (label_state == InLabelOrObjectKey) {
// If there's a label or object literal key at the end of this line,
// prompt for more lines but do not change the line level.
line_level_delta_for_next_line += 1;
}
} while (s_repl_line_level + line_level_delta_for_next_line > 0);
return piece.to_string(); return piece.to_string();
} }