diff options
| -rw-r--r-- | scintilla/lexers/LexVerilog.cxx | 30 | ||||
| -rw-r--r-- | scintilla/src/Style.cxx | 3 |
2 files changed, 21 insertions, 12 deletions
diff --git a/scintilla/lexers/LexVerilog.cxx b/scintilla/lexers/LexVerilog.cxx index cdcf8f6..e27de36 100644 --- a/scintilla/lexers/LexVerilog.cxx +++ b/scintilla/lexers/LexVerilog.cxx @@ -29,7 +29,7 @@ using namespace Scintilla; #endif
static inline bool IsAWordChar(const int ch) {
- return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\'');
+ return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\''|| ch == '$');
}
static inline bool IsAWordStart(const int ch) {
@@ -269,24 +269,36 @@ static void FoldNoBoxVerilogDoc(unsigned int startPos, int length, int initStyle if (styler.Match(j, "case") ||
styler.Match(j, "casex") ||
styler.Match(j, "casez") ||
+ styler.Match(j, "class") ||
styler.Match(j, "function") ||
- styler.Match(j, "fork") ||
- styler.Match(j, "table") ||
- styler.Match(j, "task") ||
styler.Match(j, "generate") ||
- styler.Match(j, "specify") ||
+ styler.Match(j, "covergroup") ||
+ styler.Match(j, "package") ||
styler.Match(j, "primitive") ||
+ styler.Match(j, "program") ||
+ styler.Match(j, "sequence") ||
+ styler.Match(j, "specify") ||
+ styler.Match(j, "table") ||
+ styler.Match(j, "task") ||
+ styler.Match(j, "fork") ||
(styler.Match(j, "module") && foldAtModule) ||
styler.Match(j, "begin")) {
levelNext++;
} else if (styler.Match(j, "endcase") ||
+ styler.Match(j, "endclass") ||
styler.Match(j, "endfunction") ||
- styler.Match(j, "join") ||
- styler.Match(j, "endtask") ||
styler.Match(j, "endgenerate") ||
- styler.Match(j, "endtable") ||
- styler.Match(j, "endspecify") ||
+ styler.Match(j, "endgroup") ||
+ styler.Match(j, "endpackage") ||
styler.Match(j, "endprimitive") ||
+ styler.Match(j, "endprogram") ||
+ styler.Match(j, "endsequence") ||
+ styler.Match(j, "endspecify") ||
+ styler.Match(j, "endtable") ||
+ styler.Match(j, "endtask") ||
+ styler.Match(j, "join") ||
+ styler.Match(j, "join_any") ||
+ styler.Match(j, "join_none") ||
(styler.Match(j, "endmodule") && foldAtModule) ||
(styler.Match(j, "end") && !IsAWordChar(styler.SafeGetCharAt(j+3)))) {
levelNext--;
diff --git a/scintilla/src/Style.cxx b/scintilla/src/Style.cxx index 59c30a3..ebca41d 100644 --- a/scintilla/src/Style.cxx +++ b/scintilla/src/Style.cxx @@ -143,7 +143,4 @@ void Style::ClearTo(const Style &source) { void Style::Copy(Font &font_, const FontMeasurements &fm_) {
font.MakeAlias(font_);
(FontMeasurements &)(*this) = fm_;
-#if PLAT_WX
- ascent = surface.Ascent(font);
-#endif
}
|