From a14ee98529bca7103f84ccc336c3b2e0484f8b0a Mon Sep 17 00:00:00 2001
From: JohnnyMorganz <johnnymorganz@outlook.com>
Date: Mon, 16 Dec 2024 21:11:04 +0000
Subject: [PATCH] Revert skipComments -> skipTrivia

---
 Ast/include/Luau/Lexer.h |  6 +++---
 Ast/src/Lexer.cpp        | 14 +++++++-------
 Ast/src/Parser.cpp       |  6 +++---
 tests/Lexer.test.cpp     |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Ast/include/Luau/Lexer.h b/Ast/include/Luau/Lexer.h
index 3cc7f453..12ab8095 100644
--- a/Ast/include/Luau/Lexer.h
+++ b/Ast/include/Luau/Lexer.h
@@ -156,7 +156,7 @@ class Lexer
 public:
     Lexer(const char* buffer, std::size_t bufferSize, AstNameTable& names, Position startPosition = {0, 0});
 
-    void setSkipTrivia(bool skip);
+    void setSkipComments(bool skip);
     void setReadNames(bool read);
 
     const Location& previousLocation() const
@@ -165,7 +165,7 @@ public:
     }
 
     const Lexeme& next();
-    const Lexeme& next(bool skipTrivia, bool updatePrevLocation);
+    const Lexeme& next(bool skipComments, bool updatePrevLocation);
     void nextline();
 
     Lexeme lookahead();
@@ -228,7 +228,7 @@ private:
 
     AstNameTable& names;
 
-    bool skipTrivia;
+    bool skipComments;
     bool readNames;
 
     enum class BraceType
diff --git a/Ast/src/Lexer.cpp b/Ast/src/Lexer.cpp
index e9a82f8f..121ca7e9 100644
--- a/Ast/src/Lexer.cpp
+++ b/Ast/src/Lexer.cpp
@@ -316,14 +316,14 @@ Lexer::Lexer(const char* buffer, size_t bufferSize, AstNameTable& names, Positio
           Lexeme::Eof
       )
     , names(names)
-    , skipTrivia(false)
+    , skipComments(false)
     , readNames(true)
 {
 }
 
-void Lexer::setSkipTrivia(bool skip)
+void Lexer::setSkipComments(bool skip)
 {
-    skipTrivia = skip;
+    skipComments = skip;
 }
 
 void Lexer::setReadNames(bool read)
@@ -333,12 +333,12 @@ void Lexer::setReadNames(bool read)
 
 const Lexeme& Lexer::next()
 {
-    return next(this->skipTrivia, true);
+    return next(this->skipComments, true);
 }
 
-const Lexeme& Lexer::next(bool skipTrivia, bool updatePrevLocation)
+const Lexeme& Lexer::next(bool skipComments, bool updatePrevLocation)
 {
-    // in skipTrivia mode we reject valid comments
+    // in skipComments mode we reject valid comments
     do
     {
         if (!FFlag::LuauLexerTokenizesWhitespace)
@@ -353,7 +353,7 @@ const Lexeme& Lexer::next(bool skipTrivia, bool updatePrevLocation)
 
         lexeme = readNext();
         updatePrevLocation = false;
-    } while (skipTrivia && (lexeme.type == Lexeme::Comment || lexeme.type == Lexeme::BlockComment || lexeme.type == Lexeme::Whitespace));
+    } while (skipComments && (lexeme.type == Lexeme::Comment || lexeme.type == Lexeme::BlockComment || lexeme.type == Lexeme::Whitespace));
 
     return lexeme;
 }
diff --git a/Ast/src/Parser.cpp b/Ast/src/Parser.cpp
index c61e7fb4..c53d6a81 100644
--- a/Ast/src/Parser.cpp
+++ b/Ast/src/Parser.cpp
@@ -208,7 +208,7 @@ Parser::Parser(const char* buffer, size_t bufferSize, AstNameTable& names, Alloc
     matchRecoveryStopOnToken[Lexeme::Type::Eof] = 1;
 
     // required for lookahead() to work across a comment boundary and for nextLexeme() to work when captureComments is false
-    lexer.setSkipTrivia(true);
+    lexer.setSkipComments(true);
 
     // read first lexeme (any hot comments get .header = true)
     LUAU_ASSERT(hotcommentHeader);
@@ -3572,7 +3572,7 @@ AstTypeError* Parser::reportMissingTypeError(const Location& parseErrorLocation,
 
 void Parser::nextLexeme()
 {
-    Lexeme::Type type = lexer.next(/* skipTrivia= */ false, true).type;
+    Lexeme::Type type = lexer.next(/* skipComments= */ false, true).type;
 
     while (type == Lexeme::BrokenComment || type == Lexeme::Comment || type == Lexeme::BlockComment || type == Lexeme::Whitespace)
     {
@@ -3598,7 +3598,7 @@ void Parser::nextLexeme()
             hotcomments.push_back({hotcommentHeader, lexeme.location, std::string(text + 1, text + end)});
         }
 
-        type = lexer.next(/* skipTrivia= */ false, /* updatePrevLocation= */ false).type;
+        type = lexer.next(/* skipComments= */ false, /* updatePrevLocation= */ false).type;
     }
 }
 
diff --git a/tests/Lexer.test.cpp b/tests/Lexer.test.cpp
index 7a860d60..8cbc8ee7 100644
--- a/tests/Lexer.test.cpp
+++ b/tests/Lexer.test.cpp
@@ -40,7 +40,7 @@ TEST_CASE("broken_comment_kept")
     Luau::Allocator alloc;
     AstNameTable table(alloc);
     Lexer lexer(testInput.c_str(), testInput.size(), table);
-    lexer.setSkipTrivia(true);
+    lexer.setSkipComments(true);
     CHECK_EQ(lexer.next().type, Lexeme::Type::BrokenComment);
 }
 
@@ -50,7 +50,7 @@ TEST_CASE("comment_skipped")
     Luau::Allocator alloc;
     AstNameTable table(alloc);
     Lexer lexer(testInput.c_str(), testInput.size(), table);
-    lexer.setSkipTrivia(true);
+    lexer.setSkipComments(true);
     CHECK_EQ(lexer.next().type, Lexeme::Type::Eof);
 }
 
@@ -105,7 +105,7 @@ TEST_CASE("lookahead")
     Luau::Allocator alloc;
     AstNameTable table(alloc);
     Lexer lexer(testInput.c_str(), testInput.size(), table);
-    lexer.setSkipTrivia(true);
+    lexer.setSkipComments(true);
     lexer.next(); // must call next() before reading data from lexer at least once
 
     CHECK_EQ(lexer.current().type, Lexeme::Name);