zufuliu
commented
2 months ago You can replace ugly PackLineState() and UnpackLineState() with my BacktrackToStart() (used by many lexers in Notepad4, Bash, Perl and Ruby lexers in Lexilla also uses backtracking), the code is more readable, following is diff against my current LexDart.cxx. interpolatingStack code is taken from issue #94.
diff --git a/scintilla/lexers/LexDart.cxx b/scintilla/lexers/LexDart.cxx
index 087350a7..70a7c096 100644
--- a/scintilla/lexers/LexDart.cxx
+++ b/scintilla/lexers/LexDart.cxx
@@ -20,7 +20,6 @@
#include "CharacterSet.h"
#include "StringUtils.h"
#include "LexerModule.h"
-#include "LexerUtils.h"
using namespace Lexilla;
@@ -50,6 +49,7 @@ struct EscapeSequence {
enum {
DartLineStateMaskLineComment = 1, // line comment
DartLineStateMaskImport = (1 << 1), // import
+ DartLineStateMaskInterpolation = (1 << 2),
};
//KeywordIndex++Autogenerated -- start of section automatically generated
@@ -70,10 +70,32 @@ enum class KeywordType {
While = 0x41,
};
-static_assert(DefaultNestedStateBaseStyle + 1 == SCE_DART_STRING_SQ);
-static_assert(DefaultNestedStateBaseStyle + 2 == SCE_DART_STRING_DQ);
-static_assert(DefaultNestedStateBaseStyle + 3 == SCE_DART_TRIPLE_STRING_SQ);
-static_assert(DefaultNestedStateBaseStyle + 4 == SCE_DART_TRIPLE_STRING_DQ);
+// string interpolating state
+struct InterpolatingState {
+ int state;
+ int braceCount;
+};
+
+void BacktrackToStart(const LexAccessor &styler, int stateMask, Sci_PositionU &startPos, Sci_Position &lengthDoc, int &initStyle) noexcept {
+ const Sci_Line currentLine = styler.GetLine(startPos);
+ if (currentLine != 0) {
+ Sci_Line line = currentLine - 1;
+ int lineState = styler.GetLineState(line);
+ while ((lineState & stateMask) != 0 && line != 0) {
+ --line;
+ lineState = styler.GetLineState(line);
+ }
+ if ((lineState & stateMask) == 0) {
+ ++line;
+ }
+ if (line != currentLine) {
+ const Sci_PositionU endPos = startPos + lengthDoc;
+ startPos = (line == 0)? 0 : styler.LineStart(line);
+ lengthDoc = endPos - startPos;
+ initStyle = (startPos == 0)? 0 : styler.StyleAt(startPos - 1);
+ }
+ }
+}
constexpr bool IsDartIdentifierStart(int ch) noexcept {
return IsIdentifierStart(ch) || ch == '$';
@@ -112,7 +134,7 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
KeywordType kwType = KeywordType::None;
int chBeforeIdentifier = 0;
- std::vector<int> nestedState; // string interpolation "${}"
+ std::vector<InterpolatingState> interpolatingStack;
int visibleChars = 0;
int chBefore = 0;
@@ -120,20 +142,15 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
int chPrevNonWhite = 0;
EscapeSequence escSeq;
+ if (startPos != 0) {
+ // backtrack to the line starts expression inside interpolated string.
+ BacktrackToStart(styler, DartLineStateMaskInterpolation, startPos, lengthDoc, initStyle);
+ }
+
StyleContext sc(startPos, lengthDoc, initStyle, styler);
if (sc.currentLine > 0) {
- int lineState = styler.GetLineState(sc.currentLine - 1);
- /*
- 2: lineStateLineType
- 6: commentLevel
- 3: nestedState count
- 3*4: nestedState
- */
- commentLevel = (lineState >> 2) & 0x3f;
- lineState >>= 8;
- if (lineState) {
- UnpackLineState(lineState, nestedState);
- }
+ const int lineState = styler.GetLineState(sc.currentLine - 1);
+ commentLevel = lineState >> 4;
}
if (startPos == 0) {
if (sc.Match('#', '!')) {
@@ -306,7 +323,7 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
sc.SetState(SCE_DART_OPERATOR2);
sc.Forward();
if (sc.ch == '{') {
- nestedState.push_back(escSeq.outerState);
+ interpolatingStack.push_back({sc.state, 1});
} else if (sc.ch != '$' && IsDartIdentifierStart(sc.ch)) {
sc.SetState(SCE_DART_SIMPLE_IDENTIFIER);
} else { // error
@@ -388,14 +405,18 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
sc.SetState(SCE_DART_SYMBOL_OPERATOR);
} else if (IsAGraphic(sc.ch)) {
sc.SetState(SCE_DART_OPERATOR);
- if (!nestedState.empty()) {
- sc.ChangeState(SCE_DART_OPERATOR2);
+ if (!interpolatingStack.empty() && AnyOf(sc.ch, '{', '}')) {
+ InterpolatingState ¤t = interpolatingStack.back();
if (sc.ch == '{') {
- nestedState.push_back(SCE_DART_DEFAULT);
- } else if (sc.ch == '}') {
- const int outerState = TakeAndPop(nestedState);
- sc.ForwardSetState(outerState);
- continue;
+ current.braceCount += 1;
+ } else {
+ current.braceCount -= 1;
+ if (current.braceCount == 0) {
+ sc.ChangeState(SCE_DART_OPERATOR2);
+ sc.ForwardSetState(current.state);
+ interpolatingStack.pop_back();
+ continue;
+ }
}
}
}
@@ -408,9 +429,9 @@ void ColouriseDartDoc(Sci_PositionU startPos, Sci_Position lengthDoc, int initSt
}
}
if (sc.atLineEnd) {
- int lineState = (commentLevel << 2) | lineStateLineType;
- if (!nestedState.empty()) {
- lineState |= PackLineState(nestedState) << 8;
+ int lineState = (commentLevel << 4) | lineStateLineType;
+ if (!interpolatingStack.empty()) {
+ lineState |= DartLineStateMaskInterpolation;
}
styler.SetLineState(sc.currentLine, lineState);
lineStateLineType = 0;
techee
nyamatongwe
This patch adds the Dart lexer from the Notepad4 editor originally created by Zufu Liu (@zufuliu).
Some changes have been made to make it compile and work in Scintilla since Notepad4 contains a modified Scintilla version. Also, some features of the Notepad4 lexer have been removed/changed:
The full diff is here:
Full diff
```diff --- notepad4/scintilla/lexers/LexDart.cxx 2024-08-21 11:44:51.924318156 +0200 +++ lexilla/lexers/LexDart.cxx 2024-08-20 23:22:14.215713622 +0200 @@ -1,6 +1,10 @@ -// This file is part of Notepad4. -// See License.txt for details about distribution and modification. -//! Lexer for Dart. +// Scintilla source code edit control +/** @file LexDart.cxx + ** Lexer for Dart. + **/ +// Based on Zufu Liu's Notepad4 Dart lexer +// Modified for Scintilla by Jiri Techet, 2024 +// The License.txt file describes the conditions under which this software may be distributed. #includePlease let me know your opinion and what you think should be modified. For more discussion and clarification of the above points, see https://github.com/zufuliu/notepad4/issues/806#issuecomment-2286862292 and below.
If the troff lexer gets merged first, the lexer ID in this patch will have to be modified.
Fixes #58.