fix: Incorrect horizontal scrollbar displayed.

After the recent changes to scrolling the code uses the longest line in the source code to determine if and how big horizontal scrollbars are needed. Instead of the computationally expensive calculation of the longest line, we let the lexer record it when it generates the token stream. It turns out that the lexer is also getting token streams for the included and imported files which leads to the problem.

Instead of letting the lexer do both the recording and the reporting of the longest line in the code we use the preprocessor to intercept the value before the included and imported files are preprocessed.

The fix is incomplete unless an upcoming PR to ViewPatterneditor.cpp where the longest line size is sent to the text editor is also  included.

Author: paxcut

lib/include/pl/core/lexer.hpp

@@ -49,7 +49,7 @@ namespace pl::core {
         std::optional<u128> parseInteger(std::string_view literal);
 
         Token makeToken(const Token& token, size_t length = 1);
-        static Token makeTokenAt(const Token& token, Location& location, size_t length = 1);
+        Token makeTokenAt(const Token& token, Location& location, size_t length = 1);
         void addToken(const Token& token);
         bool hasTheLineEnded(const char &ch) {
             if(ch == '\n') {

lib/include/pl/core/preprocessor.hpp

@@ -36,7 +36,8 @@ namespace pl::core {
         void addStatementHandler(const Token::Keyword &statementType, const api::StatementHandler &handler);
         void removePragmaHandler(const std::string &pragmaType);
         void removeDirectiveHandler(const Token::Directive &directiveType);
-
+        size_t getLongestLineLength() const { return m_longestLineLength; }
+        void setLongestLineLength(size_t length) { m_longestLineLength = length; }
         void validateOutput();
 
         [[nodiscard]] const std::vector<ExcludedLocation>& getExcludedLocations() const {
@@ -162,7 +163,7 @@ namespace pl::core {
         std::vector<Token> m_result;
         std::vector<Token> m_output;
         std::vector<std::string> m_namespaces;
-
+        size_t m_longestLineLength = 0;
         api::Source* m_source = nullptr;
 
         bool m_onlyIncludeOnce = false;

lib/source/pl/core/lexer.cpp

@@ -458,11 +458,13 @@ namespace pl::core {
     Token Lexer::makeToken(const Token &token, const size_t length) {
         auto location = this->location();
         location.length = length;
+        m_longestLineLength = std::max(m_longestLineLength, location.column + location.length);
         return { token.type, token.value, location };
     }
 
     Token Lexer::makeTokenAt(const Token &token, Location& location, const size_t length) {
         location.length = length;
+        m_longestLineLength = std::max(m_longestLineLength, location.column + location.length);
         return { token.type, token.value, location };
     }
 

lib/source/pl/core/preprocessor.cpp

@@ -601,7 +601,7 @@ namespace pl::core {
                 this->error(item);
             return { m_output, collectErrors() };
         }
-
+        setLongestLineLength(lexer->getLongestLineLength());
         m_token = m_result.begin();
         m_initialized = true;
         while (!eof())