diff --git a/include/eepp/ui/doc/syntaxdefinition.hpp b/include/eepp/ui/doc/syntaxdefinition.hpp index e1fa86090..510dfa946 100644 --- a/include/eepp/ui/doc/syntaxdefinition.hpp +++ b/include/eepp/ui/doc/syntaxdefinition.hpp @@ -129,12 +129,16 @@ class EE_API SyntaxDefinition { bool hasExtensionPriority() const; - void setExtensionPriority( bool hasExtensionPriority ); + SyntaxDefinition& setExtensionPriority( bool hasExtensionPriority ); UnorderedMap getSymbolNames() const; const Uint16& getLanguageIndex() const { return mLanguageIndex; } + bool isCaseInsensitive() const; + + SyntaxDefinition& setCaseInsensitive( bool caseInsensitive ); + protected: friend class SyntaxDefinitionManager; @@ -151,6 +155,7 @@ class EE_API SyntaxDefinition { bool mAutoCloseXMLTags{ false }; bool mVisible{ true }; bool mHasExtensionPriority{ false }; + bool mCaseInsensitive{ false }; }; }}} // namespace EE::UI::Doc diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index c3be696b6..dd796ba51 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -114,7 +114,7 @@ Desktop Desktop {388e5431-b31b-42b3-b9ad-9002d279d75d} - 11 + 10 0 19 diff --git a/projects/linux/ee.files b/projects/linux/ee.files index 736cc1e48..b4e6542e9 100644 --- a/projects/linux/ee.files +++ b/projects/linux/ee.files @@ -860,6 +860,8 @@ ../../src/eepp/system/virtualfilesystem.cpp ../../src/eepp/system/zip.cpp ../../src/eepp/ui/abstract/filesystemmodel.hpp +../../src/eepp/ui/doc/languages/adept.cpp +../../src/eepp/ui/doc/languages/adept.hpp ../../src/eepp/ui/doc/languages/angelscript.cpp ../../src/eepp/ui/doc/languages/angelscript.hpp ../../src/eepp/ui/doc/languages/batchscript.cpp @@ -870,10 +872,21 @@ ../../src/eepp/ui/doc/languages/c.hpp ../../src/eepp/ui/doc/languages/carbon.cpp ../../src/eepp/ui/doc/languages/carbon.hpp +../../src/eepp/ui/doc/languages/cmake.cpp +../../src/eepp/ui/doc/languages/cmake.hpp +../../src/eepp/ui/doc/languages/configfile.cpp +../../src/eepp/ui/doc/languages/configfile.hpp +../../src/eepp/ui/doc/languages/containerfile.cpp +../../src/eepp/ui/doc/languages/containerfile.hpp ../../src/eepp/ui/doc/languages/cpp.cpp ../../src/eepp/ui/doc/languages/cpp.hpp +../../src/eepp/ui/doc/languages/crystal.cpp ../../src/eepp/ui/doc/languages/crystal.hpp +../../src/eepp/ui/doc/languages/csharp.cpp +../../src/eepp/ui/doc/languages/csharp.hpp +../../src/eepp/ui/doc/languages/css.cpp ../../src/eepp/ui/doc/languages/css.hpp +../../src/eepp/ui/doc/languages/d.cpp ../../src/eepp/ui/doc/languages/d.hpp ../../src/eepp/ui/doc/languages/elixir.hpp ../../src/eepp/ui/doc/languages/elm.hpp @@ -940,16 +953,25 @@ ../../src/eepp/ui/doc/languages/difffile.cpp ../../src/eepp/ui/doc/languages/difffile.hpp ../../src/eepp/ui/doc/languages/elixir.cpp +../../src/eepp/ui/doc/languages/elixir.hpp ../../src/eepp/ui/doc/languages/elm.cpp +../../src/eepp/ui/doc/languages/elm.hpp ../../src/eepp/ui/doc/languages/environmentfile.cpp ../../src/eepp/ui/doc/languages/environmentfile.hpp +../../src/eepp/ui/doc/languages/fortran.cpp +../../src/eepp/ui/doc/languages/fortran.hpp ../../src/eepp/ui/doc/languages/fstab.cpp +../../src/eepp/ui/doc/languages/fstab.hpp +../../src/eepp/ui/doc/languages/gdscript.cpp +../../src/eepp/ui/doc/languages/gdscript.hpp ../../src/eepp/ui/doc/languages/glsl.cpp ../../src/eepp/ui/doc/languages/glsl.hpp ../../src/eepp/ui/doc/languages/go.cpp ../../src/eepp/ui/doc/languages/go.hpp ../../src/eepp/ui/doc/languages/graphql.cpp +../../src/eepp/ui/doc/languages/graphql.hpp ../../src/eepp/ui/doc/languages/hare.cpp +../../src/eepp/ui/doc/languages/hare.hpp ../../src/eepp/ui/doc/languages/haskell.cpp ../../src/eepp/ui/doc/languages/haskell.hpp ../../src/eepp/ui/doc/languages/haxe.cpp @@ -966,6 +988,10 @@ ../../src/eepp/ui/doc/languages/jai.hpp ../../src/eepp/ui/doc/languages/java.cpp ../../src/eepp/ui/doc/languages/java.hpp +../../src/eepp/ui/doc/languages/javascript.cpp +../../src/eepp/ui/doc/languages/javascript.hpp +../../src/eepp/ui/doc/languages/json.cpp +../../src/eepp/ui/doc/languages/json.hpp ../../src/eepp/ui/doc/languages/jsx.cpp ../../src/eepp/ui/doc/languages/jsx.hpp ../../src/eepp/ui/doc/languages/julia.cpp @@ -1004,6 +1030,8 @@ ../../src/eepp/ui/doc/languages/php.hpp ../../src/eepp/ui/doc/languages/pico-8.cpp ../../src/eepp/ui/doc/languages/pico-8.hpp +../../src/eepp/ui/doc/languages/plaintext.cpp +../../src/eepp/ui/doc/languages/plaintext.hpp ../../src/eepp/ui/doc/languages/po.cpp ../../src/eepp/ui/doc/languages/po.hpp ../../src/eepp/ui/doc/languages/pony.cpp @@ -1026,6 +1054,8 @@ ../../src/eepp/ui/doc/languages/scala.hpp ../../src/eepp/ui/doc/languages/shellscript.cpp ../../src/eepp/ui/doc/languages/shellscript.hpp +../../src/eepp/ui/doc/languages/smallbasic.cpp +../../src/eepp/ui/doc/languages/smallbasic.hpp ../../src/eepp/ui/doc/languages/solidity.cpp ../../src/eepp/ui/doc/languages/solidity.hpp ../../src/eepp/ui/doc/languages/sql.cpp @@ -1040,6 +1070,8 @@ ../../src/eepp/ui/doc/languages/typescript.hpp ../../src/eepp/ui/doc/languages/v.cpp ../../src/eepp/ui/doc/languages/v.hpp +../../src/eepp/ui/doc/languages/vala.cpp +../../src/eepp/ui/doc/languages/vala.hpp ../../src/eepp/ui/doc/languages/vb.cpp ../../src/eepp/ui/doc/languages/vb.hpp ../../src/eepp/ui/doc/languages/verilog.cpp diff --git a/src/eepp/ui/doc/languages/smallbasic.cpp b/src/eepp/ui/doc/languages/smallbasic.cpp index f99f3bda0..07d1f9a01 100644 --- a/src/eepp/ui/doc/languages/smallbasic.cpp +++ b/src/eepp/ui/doc/languages/smallbasic.cpp @@ -333,638 +333,11 @@ void addSmallBASIC() { { "xor", "keyword" }, { "xpos", "keyword" }, { "ymax", "keyword" }, - { "ypos", "keyword" }, - { "include", "keyword2" }, - { "Abs", "keyword" }, - { "Absmax", "keyword" }, - { "Absmin", "keyword" }, - { "Access", "keyword" }, - { "Acos", "keyword" }, - { "Acosh", "keyword" }, - { "Acot", "keyword" }, - { "Acoth", "keyword" }, - { "Acsc", "keyword" }, - { "Acsch", "keyword" }, - { "And", "keyword" }, - { "Append", "keyword" }, - { "Arc", "keyword" }, - { "Array", "keyword" }, - { "As", "keyword" }, - { "Asc", "keyword" }, - { "Asec", "keyword" }, - { "Asech", "keyword" }, - { "Asin", "keyword" }, - { "Asinh", "keyword" }, - { "At", "keyword" }, - { "Atan", "keyword" }, - { "Atan2", "keyword" }, - { "Atanh", "keyword" }, - { "Atn", "keyword" }, - { "Band", "keyword" }, - { "Bcs", "keyword" }, - { "Beep", "keyword" }, - { "Bg", "keyword" }, - { "Bgetc", "keyword" }, - { "Bin", "keyword" }, - { "Bload", "keyword" }, - { "Bor", "keyword" }, - { "Bputc", "keyword" }, - { "Bsave", "keyword" }, - { "Byref", "keyword" }, - { "Call", "keyword" }, - { "Case", "keyword" }, - { "Cat", "keyword" }, - { "Catch", "keyword" }, - { "Cbs", "keyword" }, - { "Cdbl", "keyword" }, - { "Ceil", "keyword" }, - { "Chain", "keyword" }, - { "Chart", "keyword" }, - { "Chdir", "keyword" }, - { "Chmod", "keyword" }, - { "Chop", "keyword" }, - { "Chr", "keyword" }, - { "Cint", "keyword" }, - { "Circle", "keyword" }, - { "Close", "keyword" }, - { "Cls", "keyword" }, - { "Color", "keyword" }, - { "Command", "keyword" }, - { "Const", "keyword" }, - { "Copy", "keyword" }, - { "Cos", "keyword" }, - { "Cosh", "keyword" }, - { "Cot", "keyword" }, - { "Coth", "keyword" }, - { "Creal", "keyword" }, - { "Csc", "keyword" }, - { "Csch", "keyword" }, - { "Cwd", "keyword" }, - { "Data", "keyword" }, - { "Date", "keyword" }, - { "Datedmy", "keyword" }, - { "Datefmt", "keyword" }, - { "Declare", "keyword" }, - { "Def", "keyword" }, - { "Definekey", "keyword" }, - { "Deg", "keyword" }, - { "Delay", "keyword" }, - { "Delete", "keyword" }, - { "Deriv", "keyword" }, - { "Determ", "keyword" }, - { "Diffeqn", "keyword" }, - { "Dim", "keyword" }, - { "Dirwalk", "keyword" }, - { "Disclose", "keyword" }, - { "Do", "keyword" }, - { "Draw", "keyword" }, - { "Drawpoly", "keyword" }, - { "Elif", "keyword" }, - { "Else", "keyword" }, - { "Elseif", "keyword" }, - { "Empty", "keyword" }, - { "Enclose", "keyword" }, - { "End", "keyword" }, - { "Try", "keyword" }, - { "Endif", "keyword" }, - { "Env", "keyword" }, - { "Eof", "keyword" }, - { "Eqv", "keyword" }, - { "Erase", "keyword" }, - { "Exec", "keyword" }, - { "Exist", "keyword" }, - { "Exit", "keyword" }, - { "Exp", "keyword" }, - { "Export", "keyword" }, - { "Exprseq", "keyword" }, - { "False", "keyword" }, - { "Fi", "keyword" }, - { "Files", "keyword" }, - { "Fix", "keyword" }, - { "Floor", "keyword" }, - { "For", "keyword" }, - { "Form", "keyword" }, - { "Format", "keyword" }, - { "Frac", "keyword" }, - { "Fre", "keyword" }, - { "Freefile", "keyword" }, - { "Func", "keyword" }, - { "Gosub", "keyword" }, - { "Goto", "keyword" }, - { "Hex", "keyword" }, - { "Home", "keyword" }, - { "If", "keyword" }, - { "Iff", "keyword" }, - { "Image", "keyword" }, - { "Imp", "keyword" }, - { "Import", "keyword" }, - { "In", "keyword" }, - { "Include", "keyword" }, - { "Inkey", "keyword" }, - { "Input", "keyword" }, - { "Insert", "keyword" }, - { "Instr", "keyword" }, - { "Int", "keyword" }, - { "Intersect", "keyword" }, - { "Inverse", "keyword" }, - { "Isarray", "keyword" }, - { "Isdir", "keyword" }, - { "Isfile", "keyword" }, - { "Islink", "keyword" }, - { "Ismap", "keyword" }, - { "Isnumber", "keyword" }, - { "Isstring", "keyword" }, - { "Join", "keyword" }, - { "Julian", "keyword" }, - { "Kill", "keyword" }, - { "Label", "keyword" }, - { "Lbound", "keyword" }, - { "Lcase", "keyword" }, - { "Left", "keyword" }, - { "Leftof", "keyword" }, - { "Leftoflast", "keyword" }, - { "Len", "keyword" }, - { "Let", "keyword" }, - { "Like", "keyword" }, - { "Line", "keyword" }, - { "Lineinput", "keyword" }, - { "Lineqn", "keyword" }, - { "Linput", "keyword" }, - { "Local", "keyword" }, - { "Locate", "keyword" }, - { "Lock", "keyword" }, - { "Lof", "keyword" }, - { "Log", "keyword" }, - { "Log10", "keyword" }, - { "Logprint", "keyword" }, - { "Lower", "keyword" }, - { "Lshift", "keyword" }, - { "Ltrim", "keyword" }, - { "M3apply", "keyword" }, - { "M3ident", "keyword" }, - { "M3rotate", "keyword" }, - { "M3scale", "keyword" }, - { "M3trans", "keyword" }, - { "Max", "keyword" }, - { "Maxint", "keyword" }, - { "Mdl", "keyword" }, - { "Mid", "keyword" }, - { "Min", "keyword" }, - { "Mkdir", "keyword" }, - { "Mod", "keyword" }, - { "Nand", "keyword" }, - { "Next", "keyword" }, - { "Nil", "keyword" }, - { "Nor", "keyword" }, - { "Nosound", "keyword" }, - { "Not", "keyword" }, - { "Oct", "keyword" }, - { "On", "keyword" }, - { "Open", "keyword" }, - { "Option", "keyword" }, - { "Or", "keyword" }, - { "Paint", "keyword" }, - { "Pause", "keyword" }, - { "Pen", "keyword" }, - { "Pen", "keyword" }, - { "Pi", "keyword" }, - { "Play", "keyword" }, - { "Plot", "keyword" }, - { "Point", "keyword" }, - { "Polyarea", "keyword" }, - { "Polycent", "keyword" }, - { "Polyext", "keyword" }, - { "Pow", "keyword" }, - { "Print", "keyword" }, - { "Progline", "keyword" }, - { "Pset", "keyword" }, - { "Ptdistln", "keyword" }, - { "Ptdistseg", "keyword" }, - { "Ptsign", "keyword" }, - { "Rad", "keyword" }, - { "Randomize", "keyword" }, - { "Read", "keyword" }, - { "Rect", "keyword" }, - { "Redim", "keyword" }, - { "Rem", "keyword" }, - { "Rename", "keyword" }, - { "Repeat", "keyword" }, - { "Replace", "keyword" }, - { "Restore", "keyword" }, - { "Return", "keyword" }, - { "Rgb", "keyword" }, - { "Rgbf", "keyword" }, - { "Right", "keyword" }, - { "Rightof", "keyword" }, - { "Rightoflast", "keyword" }, - { "Rinstr", "keyword" }, - { "Rmdir", "keyword" }, - { "Rnd", "keyword" }, - { "Root", "keyword" }, - { "Round", "keyword" }, - { "Rshift", "keyword" }, - { "Rtrim", "keyword" }, - { "Run", "keyword" }, - { "Sbver", "keyword" }, - { "Search", "keyword" }, - { "Sec", "keyword" }, - { "Sech", "keyword" }, - { "Seek", "keyword" }, - { "Seek", "keyword" }, - { "Segcos", "keyword" }, - { "Seglen", "keyword" }, - { "Segsin", "keyword" }, - { "Select", "keyword" }, - { "Self", "keyword" }, - { "Seq", "keyword" }, - { "Sgn", "keyword" }, - { "Showpage", "keyword" }, - { "Sin", "keyword" }, - { "Sinh", "keyword" }, - { "Sinput", "keyword" }, - { "Sort", "keyword" }, - { "Sound", "keyword" }, - { "Space", "keyword" }, - { "Spc", "keyword" }, - { "Split", "keyword" }, - { "Sprint", "keyword" }, - { "Sqr", "keyword" }, - { "Squeeze", "keyword" }, - { "Statmean", "keyword" }, - { "Statmeandev", "keyword" }, - { "Statspreadp", "keyword" }, - { "Statspreads", "keyword" }, - { "Step", "keyword" }, - { "Stkdump", "keyword" }, - { "Stop", "keyword" }, - { "Str", "keyword" }, - { "String", "keyword" }, - { "Sub", "keyword" }, - { "Sum", "keyword" }, - { "Sumsq", "keyword" }, - { "Swap", "keyword" }, - { "Tab", "keyword" }, - { "Tan", "keyword" }, - { "Tanh", "keyword" }, - { "Textheight", "keyword" }, - { "Textwidth", "keyword" }, - { "Then", "keyword" }, - { "Throw", "keyword" }, - { "Ticks", "keyword" }, - { "Time", "keyword" }, - { "Timehms", "keyword" }, - { "Timer", "keyword" }, - { "Timestamp", "keyword" }, - { "Tload", "keyword" }, - { "To", "keyword" }, - { "Translate", "keyword" }, - { "Trim", "keyword" }, - { "Troff", "keyword" }, - { "Tron", "keyword" }, - { "True", "keyword" }, - { "Try", "keyword" }, - { "Tsave", "keyword" }, - { "Txth", "keyword" }, - { "Txtw", "keyword" }, - { "Ubound", "keyword" }, - { "Ucase", "keyword" }, - { "Unit", "keyword" }, - { "Until", "keyword" }, - { "Upper", "keyword" }, - { "Use", "keyword" }, - { "Usg", "keyword" }, - { "Using", "keyword" }, - { "Val", "keyword" }, - { "View", "keyword" }, - { "Weekday", "keyword" }, - { "Wend", "keyword" }, - { "While", "keyword" }, - { "Window", "keyword" }, - { "Write", "keyword" }, - { "Xmax", "keyword" }, - { "Xnor", "keyword" }, - { "Xor", "keyword" }, - { "Xpos", "keyword" }, - { "Ymax", "keyword" }, - { "Ypos", "keyword" }, - { "Include", "keyword2" }, - { "ABS", "keyword" }, - { "ABSMAX", "keyword" }, - { "ABSMIN", "keyword" }, - { "ACCESS", "keyword" }, - { "ACOS", "keyword" }, - { "ACOSH", "keyword" }, - { "ACOT", "keyword" }, - { "ACOTH", "keyword" }, - { "ACSC", "keyword" }, - { "ACSCH", "keyword" }, - { "AND", "keyword" }, - { "APPEND", "keyword" }, - { "ARC", "keyword" }, - { "ARRAY", "keyword" }, - { "AS", "keyword" }, - { "ASC", "keyword" }, - { "ASEC", "keyword" }, - { "ASECH", "keyword" }, - { "ASIN", "keyword" }, - { "ASINH", "keyword" }, - { "AT", "keyword" }, - { "ATAN", "keyword" }, - { "ATAN2", "keyword" }, - { "ATANH", "keyword" }, - { "ATN", "keyword" }, - { "BAND", "keyword" }, - { "BCS", "keyword" }, - { "BEEP", "keyword" }, - { "BG", "keyword" }, - { "BGETC", "keyword" }, - { "BIN", "keyword" }, - { "BLOAD", "keyword" }, - { "BOR", "keyword" }, - { "BPUTC", "keyword" }, - { "BSAVE", "keyword" }, - { "BYREF", "keyword" }, - { "CALL", "keyword" }, - { "CASE", "keyword" }, - { "CAT", "keyword" }, - { "CATCH", "keyword" }, - { "CBS", "keyword" }, - { "CDBL", "keyword" }, - { "CEIL", "keyword" }, - { "CHAIN", "keyword" }, - { "CHART", "keyword" }, - { "CHDIR", "keyword" }, - { "CHMOD", "keyword" }, - { "CHOP", "keyword" }, - { "CHR", "keyword" }, - { "CINT", "keyword" }, - { "CIRCLE", "keyword" }, - { "CLOSE", "keyword" }, - { "CLS", "keyword" }, - { "COLOR", "keyword" }, - { "COMMAND", "keyword" }, - { "CONST", "keyword" }, - { "COPY", "keyword" }, - { "COS", "keyword" }, - { "COSH", "keyword" }, - { "COT", "keyword" }, - { "COTH", "keyword" }, - { "CREAL", "keyword" }, - { "CSC", "keyword" }, - { "CSCH", "keyword" }, - { "CWD", "keyword" }, - { "DATA", "keyword" }, - { "DATE", "keyword" }, - { "DATEDMY", "keyword" }, - { "DATEFMT", "keyword" }, - { "DECLARE", "keyword" }, - { "DEF", "keyword" }, - { "DEFINEKEY", "keyword" }, - { "DEG", "keyword" }, - { "DELAY", "keyword" }, - { "DELETE", "keyword" }, - { "DERIV", "keyword" }, - { "DETERM", "keyword" }, - { "DIFFEQN", "keyword" }, - { "DIM", "keyword" }, - { "DIRWALK", "keyword" }, - { "DISCLOSE", "keyword" }, - { "DO", "keyword" }, - { "DRAW", "keyword" }, - { "DRAWPOLY", "keyword" }, - { "ELIF", "keyword" }, - { "ELSE", "keyword" }, - { "ELSEIF", "keyword" }, - { "EMPTY", "keyword" }, - { "ENCLOSE", "keyword" }, - { "END", "keyword" }, - { "TRY", "keyword" }, - { "ENDIF", "keyword" }, - { "ENV", "keyword" }, - { "EOF", "keyword" }, - { "EQV", "keyword" }, - { "ERASE", "keyword" }, - { "EXEC", "keyword" }, - { "EXIST", "keyword" }, - { "EXIT", "keyword" }, - { "EXP", "keyword" }, - { "EXPORT", "keyword" }, - { "EXPRSEQ", "keyword" }, - { "FALSE", "keyword" }, - { "FI", "keyword" }, - { "FILES", "keyword" }, - { "FIX", "keyword" }, - { "FLOOR", "keyword" }, - { "FOR", "keyword" }, - { "FORM", "keyword" }, - { "FORMAT", "keyword" }, - { "FRAC", "keyword" }, - { "FRE", "keyword" }, - { "FREEFILE", "keyword" }, - { "FUNC", "keyword" }, - { "GOSUB", "keyword" }, - { "GOTO", "keyword" }, - { "HEX", "keyword" }, - { "HOME", "keyword" }, - { "IF", "keyword" }, - { "IFF", "keyword" }, - { "IMAGE", "keyword" }, - { "IMP", "keyword" }, - { "IMPORT", "keyword" }, - { "IN", "keyword" }, - { "INCLUDE", "keyword" }, - { "INKEY", "keyword" }, - { "INPUT", "keyword" }, - { "INSERT", "keyword" }, - { "INSTR", "keyword" }, - { "INT", "keyword" }, - { "INTERSECT", "keyword" }, - { "INVERSE", "keyword" }, - { "ISARRAY", "keyword" }, - { "ISDIR", "keyword" }, - { "ISFILE", "keyword" }, - { "ISLINK", "keyword" }, - { "ISMAP", "keyword" }, - { "ISNUMBER", "keyword" }, - { "ISSTRING", "keyword" }, - { "JOIN", "keyword" }, - { "JULIAN", "keyword" }, - { "KILL", "keyword" }, - { "LABEL", "keyword" }, - { "LBOUND", "keyword" }, - { "LCASE", "keyword" }, - { "LEFT", "keyword" }, - { "LEFTOF", "keyword" }, - { "LEFTOFLAST", "keyword" }, - { "LEN", "keyword" }, - { "LET", "keyword" }, - { "LIKE", "keyword" }, - { "LINE", "keyword" }, - { "LINEINPUT", "keyword" }, - { "LINEQN", "keyword" }, - { "LINPUT", "keyword" }, - { "LOCAL", "keyword" }, - { "LOCATE", "keyword" }, - { "LOCK", "keyword" }, - { "LOF", "keyword" }, - { "LOG", "keyword" }, - { "LOG10", "keyword" }, - { "LOGPRINT", "keyword" }, - { "LOWER", "keyword" }, - { "LSHIFT", "keyword" }, - { "LTRIM", "keyword" }, - { "M3APPLY", "keyword" }, - { "M3IDENT", "keyword" }, - { "M3ROTATE", "keyword" }, - { "M3SCALE", "keyword" }, - { "M3TRANS", "keyword" }, - { "MAX", "keyword" }, - { "MAXINT", "keyword" }, - { "MDL", "keyword" }, - { "MID", "keyword" }, - { "MIN", "keyword" }, - { "MKDIR", "keyword" }, - { "MOD", "keyword" }, - { "NAND", "keyword" }, - { "NEXT", "keyword" }, - { "NIL", "keyword" }, - { "NOR", "keyword" }, - { "NOSOUND", "keyword" }, - { "NOT", "keyword" }, - { "OCT", "keyword" }, - { "ON", "keyword" }, - { "OPEN", "keyword" }, - { "OPTION", "keyword" }, - { "OR", "keyword" }, - { "PAINT", "keyword" }, - { "PAUSE", "keyword" }, - { "PEN", "keyword" }, - { "PEN", "keyword" }, - { "PI", "keyword" }, - { "PLAY", "keyword" }, - { "PLOT", "keyword" }, - { "POINT", "keyword" }, - { "POLYAREA", "keyword" }, - { "POLYCENT", "keyword" }, - { "POLYEXT", "keyword" }, - { "POW", "keyword" }, - { "PRINT", "keyword" }, - { "PROGLINE", "keyword" }, - { "PSET", "keyword" }, - { "PTDISTLN", "keyword" }, - { "PTDISTSEG", "keyword" }, - { "PTSIGN", "keyword" }, - { "RAD", "keyword" }, - { "RANDOMIZE", "keyword" }, - { "READ", "keyword" }, - { "RECT", "keyword" }, - { "REDIM", "keyword" }, - { "REM", "keyword" }, - { "RENAME", "keyword" }, - { "REPEAT", "keyword" }, - { "REPLACE", "keyword" }, - { "RESTORE", "keyword" }, - { "RETURN", "keyword" }, - { "RGB", "keyword" }, - { "RGBF", "keyword" }, - { "RIGHT", "keyword" }, - { "RIGHTOF", "keyword" }, - { "RIGHTOFLAST", "keyword" }, - { "RINSTR", "keyword" }, - { "RMDIR", "keyword" }, - { "RND", "keyword" }, - { "ROOT", "keyword" }, - { "ROUND", "keyword" }, - { "RSHIFT", "keyword" }, - { "RTRIM", "keyword" }, - { "RUN", "keyword" }, - { "SBVER", "keyword" }, - { "SEARCH", "keyword" }, - { "SEC", "keyword" }, - { "SECH", "keyword" }, - { "SEEK", "keyword" }, - { "SEEK", "keyword" }, - { "SEGCOS", "keyword" }, - { "SEGLEN", "keyword" }, - { "SEGSIN", "keyword" }, - { "SELECT", "keyword" }, - { "SELF", "keyword" }, - { "SEQ", "keyword" }, - { "SGN", "keyword" }, - { "SHOWPAGE", "keyword" }, - { "SIN", "keyword" }, - { "SINH", "keyword" }, - { "SINPUT", "keyword" }, - { "SORT", "keyword" }, - { "SOUND", "keyword" }, - { "SPACE", "keyword" }, - { "SPC", "keyword" }, - { "SPLIT", "keyword" }, - { "SPRINT", "keyword" }, - { "SQR", "keyword" }, - { "SQUEEZE", "keyword" }, - { "STATMEAN", "keyword" }, - { "STATMEANDEV", "keyword" }, - { "STATSPREADP", "keyword" }, - { "STATSPREADS", "keyword" }, - { "STEP", "keyword" }, - { "STKDUMP", "keyword" }, - { "STOP", "keyword" }, - { "STR", "keyword" }, - { "STRING", "keyword" }, - { "SUB", "keyword" }, - { "SUM", "keyword" }, - { "SUMSQ", "keyword" }, - { "SWAP", "keyword" }, - { "TAB", "keyword" }, - { "TAN", "keyword" }, - { "TANH", "keyword" }, - { "TEXTHEIGHT", "keyword" }, - { "TEXTWIDTH", "keyword" }, - { "THEN", "keyword" }, - { "THROW", "keyword" }, - { "TICKS", "keyword" }, - { "TIME", "keyword" }, - { "TIMEHMS", "keyword" }, - { "TIMER", "keyword" }, - { "TIMESTAMP", "keyword" }, - { "TLOAD", "keyword" }, - { "TO", "keyword" }, - { "TRANSLATE", "keyword" }, - { "TRIM", "keyword" }, - { "TROFF", "keyword" }, - { "TRON", "keyword" }, - { "TRUE", "keyword" }, - { "TRY", "keyword" }, - { "TSAVE", "keyword" }, - { "TXTH", "keyword" }, - { "TXTW", "keyword" }, - { "UBOUND", "keyword" }, - { "UCASE", "keyword" }, - { "UNIT", "keyword" }, - { "UNTIL", "keyword" }, - { "UPPER", "keyword" }, - { "USE", "keyword" }, - { "USG", "keyword" }, - { "USING", "keyword" }, - { "VAL", "keyword" }, - { "VIEW", "keyword" }, - { "WEEKDAY", "keyword" }, - { "WEND", "keyword" }, - { "WHILE", "keyword" }, - { "WINDOW", "keyword" }, - { "WRITE", "keyword" }, - { "XMAX", "keyword" }, - { "XNOR", "keyword" }, - { "XOR", "keyword" }, - { "XPOS", "keyword" }, - { "YMAX", "keyword" }, - { "YPOS", "keyword" }, - { "INCLUDE", "keyword2" } }, + { "ypos", "keyword" } }, "'", {} - } ); + } ).setCaseInsensitive( true ); } }}}} // namespace EE::UI::Doc::Language diff --git a/src/eepp/ui/doc/languages/vb.cpp b/src/eepp/ui/doc/languages/vb.cpp index d24434ec6..710f99101 100644 --- a/src/eepp/ui/doc/languages/vb.cpp +++ b/src/eepp/ui/doc/languages/vb.cpp @@ -5,78 +5,58 @@ namespace EE { namespace UI { namespace Doc { namespace Language { void addVisualBasic() { - SyntaxDefinitionManager::instance()->add( + SyntaxDefinitionManager::instance() + ->add( - { "Visual Basic", - { "%.bas$", "%.cls$", "%.ctl$", "%.dob$", "%.dsm$", "%.dsr$", "%.frm$", "%.pag$", "%.vb$", - "%.vba$", "%.vbs$" }, - { - { { "'.*" }, "comment" }, - { { "REM%s.*" }, "comment" }, - { { "\"", "\"" }, "string" }, - { { "-?&H%x+" }, "number" }, - { { "-?%d+[%d%.eE]*" }, "number" }, - { { "-?%.?%d+f?" }, "number" }, - { { "[=><%+%-%*%^&:%.,_%(%)]" }, "operator" }, - { { "[%a_][%w_]*" }, "symbol" }, + { "Visual Basic", + { "%.bas$", "%.cls$", "%.ctl$", "%.dob$", "%.dsm$", "%.dsr$", "%.frm$", "%.pag$", + "%.vb$", "%.vba$", "%.vbs$" }, + { + { { "'.*" }, "comment" }, + { { "REM%s.*" }, "comment" }, + { { "\"", "\"" }, "string" }, + { { "-?&H%x+" }, "number" }, + { { "-?%d+[%d%.eE]*" }, "number" }, + { { "-?%.?%d+f?" }, "number" }, + { { "[=><%+%-%*%^&:%.,_%(%)]" }, "operator" }, + { { "[%a_][%w_]*" }, "symbol" }, - }, - { + }, + { + { "then", "keyword" }, { "new", "keyword" }, { "continue", "keyword" }, + { "on", "keyword" }, { "default", "keyword" }, { "begin", "keyword" }, + { "char", "keyword2" }, { "set", "keyword" }, { "wend", "keyword" }, + { "byref", "keyword" }, { "loop", "keyword" }, { "attribute", "keyword" }, + { "long", "keyword2" }, { "execute", "keyword" }, { "xor", "keyword" }, + { "end", "keyword" }, { "short", "keyword2" }, { "date", "keyword2" }, + { "object", "keyword2" }, { "variant", "keyword2" }, { "sub", "keyword" }, + { "with", "keyword" }, { "false", "keyword" }, { "for", "keyword" }, + { "goto", "keyword" }, { "while", "keyword" }, { "const", "keyword" }, + { "get", "keyword" }, { "lib", "keyword" }, { "call", "keyword" }, + { "null", "keyword" }, { "select", "keyword" }, { "function", "keyword" }, + { "else", "keyword" }, { "next", "keyword" }, { "option", "keyword" }, + { "enum", "keyword" }, { "is", "keyword" }, { "declare", "keyword" }, + { "decimal", "keyword2" }, { "string", "keyword2" }, { "or", "keyword" }, + { "until", "keyword" }, { "if", "keyword" }, { "nothing", "keyword" }, + { "let", "keyword" }, { "property", "keyword" }, { "step", "keyword" }, + { "dim", "keyword" }, { "elseif", "keyword" }, { "in", "keyword" }, + { "single", "keyword2" }, { "exit", "keyword" }, { "public", "keyword" }, + { "and", "keyword" }, { "private", "keyword" }, { "each", "keyword" }, + { "redim", "keyword" }, { "preserve", "keyword" }, { "byval", "keyword" }, + { "double", "keyword2" }, { "return", "keyword" }, { "error", "keyword" }, + { "as", "keyword" }, { "class", "keyword" }, { "byte", "keyword2" }, + { "module", "keyword" }, { "randomize", "keyword" }, { "boolean", "keyword2" }, + { "explicit", "keyword" }, { "true", "keyword" }, { "not", "keyword" }, + { "integer", "keyword2" }, { "case", "keyword" }, { "mod", "keyword" }, + { "do", "keyword" }, { "empty", "keyword" }, { "type", "keyword" }, + { "to", "keyword" }, + }, + "'", + {} - { "If", "keyword" }, { "Then", "keyword" }, { "Else", "keyword" }, - { "ElseIf", "keyword" }, { "While", "keyword" }, { "Wend", "keyword" }, - { "For", "keyword" }, { "To", "keyword" }, { "Each", "keyword" }, - { "In", "keyword" }, { "Step", "keyword" }, { "Case", "keyword" }, - { "Select", "keyword" }, { "Return", "keyword" }, { "Continue", "keyword" }, - { "Do", "keyword" }, { "Until", "keyword" }, { "Loop", "keyword" }, - { "Next", "keyword" }, { "With", "keyword" }, { "Exit", "keyword" }, - { "Mod", "keyword" }, { "And", "keyword" }, { "Not", "keyword" }, - { "Or", "keyword" }, { "Xor", "keyword" }, { "Is", "keyword" }, - { "Call", "keyword" }, { "Class", "keyword" }, { "Const", "keyword" }, - { "Enum", "keyword" }, { "ENUM", "keyword" }, { "Dim", "keyword" }, - { "ReDim", "keyword" }, { "Preserve", "keyword" }, { "Function", "keyword" }, - { "Sub", "keyword" }, { "Property", "keyword" }, { "End", "keyword" }, - { "Set", "keyword" }, { "Let", "keyword" }, { "Get", "keyword" }, - { "New", "keyword" }, { "Randomize", "keyword" }, { "Option", "keyword" }, - { "Explicit", "keyword" }, { "On", "keyword" }, { "As", "keyword" }, - { "AS", "keyword" }, { "Declare", "keyword" }, { "Error", "keyword" }, - { "Execute", "keyword" }, { "Module", "keyword" }, { "Private", "keyword" }, - { "Public", "keyword" }, { "Default", "keyword" }, { "Empty", "keyword" }, - { "GoTo", "keyword" }, { "False", "keyword" }, { "Nothing", "keyword" }, - { "Type", "keyword" }, { "Lib", "keyword" }, { "ByVal", "keyword" }, - { "ByRef", "keyword" }, { "Null", "keyword" }, { "Attribute", "keyword" }, - { "True", "keyword" }, { "IF", "keyword" }, { "THEN", "keyword" }, - { "Begin", "keyword" }, { "BEGIN", "keyword" }, { "ELSE", "keyword" }, - { "ELSEIF", "keyword" }, { "WHILE", "keyword" }, { "WEND", "keyword" }, - { "FOR", "keyword" }, { "TO", "keyword" }, { "EACH", "keyword" }, - { "IN", "keyword" }, { "STEP", "keyword" }, { "CASE", "keyword" }, - { "SELECT", "keyword" }, { "RETURN", "keyword" }, { "CONTINUE", "keyword" }, - { "DO", "keyword" }, { "UNTIL", "keyword" }, { "LOOP", "keyword" }, - { "NEXT", "keyword" }, { "WITH", "keyword" }, { "EXIT", "keyword" }, - { "MOD", "keyword" }, { "AND", "keyword" }, { "NOT", "keyword" }, - { "OR", "keyword" }, { "XOR", "keyword" }, { "IS", "keyword" }, - { "CALL", "keyword" }, { "CLASS", "keyword" }, { "CONST", "keyword" }, - { "DIM", "keyword" }, { "REDIM", "keyword" }, { "PRESERVE", "keyword" }, - { "FUNCTION", "keyword" }, { "SUB", "keyword" }, { "PROPERTY", "keyword" }, - { "END", "keyword" }, { "SET", "keyword" }, { "LET", "keyword" }, - { "GET", "keyword" }, { "NEW", "keyword" }, { "RANDOMIZE", "keyword" }, - { "OPTION", "keyword" }, { "EXPLICIT", "keyword" }, { "ON", "keyword" }, - { "ERROR", "keyword" }, { "EXECUTE", "keyword" }, { "MODULE", "keyword" }, - { "PRIVATE", "keyword" }, { "PUBLIC", "keyword" }, { "DEFAULT", "keyword" }, - { "EMPTY", "keyword" }, { "FALSE", "keyword" }, { "NOTHING", "keyword" }, - { "NULL", "keyword" }, { "TRUE", "keyword" }, { "Boolean", "keyword2" }, - { "Byte", "keyword2" }, { "Char", "keyword2" }, { "Date", "keyword2" }, - { "Decimal", "keyword2" }, { "Integer", "keyword2" }, { "Double", "keyword2" }, - { "Long", "keyword2" }, { "Object", "keyword2" }, { "Short", "keyword2" }, - { "Single", "keyword2" }, { "String", "keyword2" }, { "BOOLEAN", "keyword2" }, - { "BYTE", "keyword2" }, { "CHAR", "keyword2" }, { "DATE", "keyword2" }, - { "DECIMAL", "keyword2" }, { "DOUBLE", "keyword2" }, { "LONG", "keyword2" }, - { "OBJECT", "keyword2" }, { "SHORT", "keyword2" }, { "INTEGER", "keyword2" }, - { "SINGLE", "keyword2" }, { "STRING", "keyword2" }, { "Variant", "keyword2" } }, - "'", - {} - - } ).setExtensionPriority( true ); + } ) + .setExtensionPriority( true ) + .setCaseInsensitive( true ); } }}}} // namespace EE::UI::Doc::Language diff --git a/src/eepp/ui/doc/syntaxdefinition.cpp b/src/eepp/ui/doc/syntaxdefinition.cpp index 02e72cc54..e64c0714c 100644 --- a/src/eepp/ui/doc/syntaxdefinition.cpp +++ b/src/eepp/ui/doc/syntaxdefinition.cpp @@ -75,14 +75,24 @@ bool SyntaxDefinition::hasExtensionPriority() const { return mHasExtensionPriority; } -void SyntaxDefinition::setExtensionPriority( bool hasExtensionPriority ) { +SyntaxDefinition& SyntaxDefinition::setExtensionPriority( bool hasExtensionPriority ) { mHasExtensionPriority = hasExtensionPriority; + return *this; } UnorderedMap SyntaxDefinition::getSymbolNames() const { return mSymbolNames; } +bool SyntaxDefinition::isCaseInsensitive() const { + return mCaseInsensitive; +} + +SyntaxDefinition& SyntaxDefinition::setCaseInsensitive( bool caseInsensitive ) { + mCaseInsensitive = caseInsensitive; + return *this; +} + const std::vector& SyntaxDefinition::getPatterns() const { return mPatterns; } @@ -96,7 +106,7 @@ const UnorderedMap& SyntaxDefinition::getSymbols() } SyntaxStyleType SyntaxDefinition::getSymbol( const std::string& symbol ) const { - auto it = mSymbols.find( symbol ); + auto it = mSymbols.find( mCaseInsensitive ? String::toLower( symbol ) : symbol ); if ( it != mSymbols.end() ) return it->second; return SyntaxStyleEmpty(); diff --git a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp index 5e59b9ffb..3966fadd6 100644 --- a/src/eepp/ui/doc/syntaxdefinitionmanager.cpp +++ b/src/eepp/ui/doc/syntaxdefinitionmanager.cpp @@ -549,6 +549,10 @@ static SyntaxDefinition loadLanguage( const nlohmann::json& json ) { def.setVisible( json["visible"].get() ); if ( json.contains( "auto_close_xml_tags" ) && json["auto_close_xml_tags"].is_boolean() ) def.setAutoCloseXMLTags( json["auto_close_xml_tags"].get() ); + if ( json.contains( "extension_priority" ) && json["extension_priority"].is_boolean() ) + def.setExtensionPriority( json["extension_priority"].get() ); + if ( json.contains( "case_insensitive" ) && json["case_insensitive"].is_boolean() ) + def.setCaseInsensitive( json["case_insensitive"].get() ); } catch ( const json::exception& e ) { Log::error( "SyntaxDefinition loadLanguage failed:\n%s", e.what() ); } diff --git a/src/eepp/ui/doc/syntaxhighlighter.cpp b/src/eepp/ui/doc/syntaxhighlighter.cpp index 4840a17af..97f15fd82 100644 --- a/src/eepp/ui/doc/syntaxhighlighter.cpp +++ b/src/eepp/ui/doc/syntaxhighlighter.cpp @@ -24,8 +24,7 @@ SyntaxHighlighter::SyntaxHighlighter( TextDocument* doc ) : SyntaxHighlighter::~SyntaxHighlighter() { mStopTokenizing = true; - while ( mTokenizeAsync ) - Sys::sleep( Milliseconds( 0.1 ) ); + reset(); } void SyntaxHighlighter::changeDoc( TextDocument* doc ) { diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp index 006bd4e0d..3cb078852 100644 --- a/src/eepp/ui/uicodeeditor.cpp +++ b/src/eepp/ui/uicodeeditor.cpp @@ -2427,9 +2427,16 @@ void UICodeEditor::setEnableColorPickerOnSelection( const bool& enableColorPicke } void UICodeEditor::setSyntaxDefinition( const SyntaxDefinition& definition ) { + if ( &definition == &mDoc->getSyntaxDefinition() ) + return; std::string oldLang( mDoc->getSyntaxDefinition().getLanguageName() ); mDoc->getHighlighter()->reset(); mDoc->setSyntaxDefinition( definition ); + if ( mMinimapEnabled && getUISceneNode()->hasThreadPool() ) { + mDoc->getHighlighter()->tokenizeAsync( getUISceneNode()->getThreadPool(), [this] { + runOnMainThread( [this] { invalidateDraw(); } ); + } ); + } invalidateDraw(); DocSyntaxDefEvent event( this, mDoc.get(), Event::OnDocumentSyntaxDefinitionChange, oldLang, mDoc->getSyntaxDefinition().getLanguageName() ); @@ -3043,7 +3050,7 @@ void UICodeEditor::drawWordMatch( const String& text, const std::pair& void UICodeEditor::drawLineText( const Int64& line, Vector2f position, const Float& fontSize, const Float& lineHeight ) { Vector2f originalPosition( position ); - auto& tokens = mDoc->getHighlighter()->getLine( line ); + const auto& tokens = mDoc->getHighlighter()->getLine( line ); const String& strLine = mDoc->line( line ).getText(); Primitives primitives; Int64 curChar = 0; diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index afd0b5f26..1ac67cabf 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -2010,49 +2010,48 @@ std::map App::getDefaultKeybindings() { std::map App::getLocalKeybindings() { return { { { KEY_RETURN, KEYMOD_LALT | KEYMOD_LCTRL }, "fullscreen-toggle" }, - { { KEY_F3, KEYMOD_NONE }, "repeat-find" }, { { KEY_F3, KEYMOD_SHIFT }, "find-prev" }, - { { KEY_F12, KEYMOD_NONE }, "console-toggle" }, - { { KEY_F, KeyMod::getDefaultModifier() }, "find-replace" }, - { { KEY_Q, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "close-app" }, - { { KEY_O, KeyMod::getDefaultModifier() }, "open-file" }, - { { KEY_W, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "download-file-web" }, - { { KEY_O, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "open-folder" }, - { { KEY_F11, KEYMOD_NONE }, "debug-widget-tree-view" }, - { { KEY_K, KeyMod::getDefaultModifier() }, "open-locatebar" }, - { { KEY_P, KeyMod::getDefaultModifier() }, "open-command-palette" }, - { { KEY_F, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "open-global-search" }, - { { KEY_L, KeyMod::getDefaultModifier() }, "go-to-line" }, + { { KEY_F3, KEYMOD_NONE }, "repeat-find" }, + { { KEY_F3, KEYMOD_SHIFT }, "find-prev" }, + { { KEY_F12, KEYMOD_NONE }, "console-toggle" }, + { { KEY_F, KeyMod::getDefaultModifier() }, "find-replace" }, + { { KEY_Q, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "close-app" }, + { { KEY_O, KeyMod::getDefaultModifier() }, "open-file" }, + { { KEY_W, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "download-file-web" }, + { { KEY_O, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "open-folder" }, + { { KEY_F11, KEYMOD_NONE }, "debug-widget-tree-view" }, + { { KEY_K, KeyMod::getDefaultModifier() }, "open-locatebar" }, + { { KEY_P, KeyMod::getDefaultModifier() }, "open-command-palette" }, + { { KEY_F, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "open-global-search" }, + { { KEY_L, KeyMod::getDefaultModifier() }, "go-to-line" }, #if EE_PLATFORM == EE_PLATFORM_MACOS - { { KEY_M, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "menu-toggle" }, + { { KEY_M, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "menu-toggle" }, #else - { { KEY_M, KeyMod::getDefaultModifier() }, "menu-toggle" }, + { { KEY_M, KeyMod::getDefaultModifier() }, "menu-toggle" }, #endif - { { KEY_S, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "save-all" }, - { { KEY_F9, KEYMOD_LALT }, "switch-side-panel" }, - { { KEY_J, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, - "terminal-split-left" }, - { { KEY_L, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, - "terminal-split-right" }, - { { KEY_I, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, - "terminal-split-top" }, - { { KEY_K, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, - "terminal-split-bottom" }, - { { KEY_S, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, - "terminal-split-swap" }, - { { KEY_T, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, - "reopen-closed-tab" }, - { { KEY_1, KEYMOD_LALT }, "toggle-status-locate-bar" }, - { { KEY_2, KEYMOD_LALT }, "toggle-status-global-search-bar" }, - { { KEY_3, KEYMOD_LALT }, "toggle-status-terminal" }, - { { KEY_4, KEYMOD_LALT }, "toggle-status-build-output" }, - { { KEY_B, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "project-build-start" }, - { { KEY_C, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "project-build-cancel" }, - { { KEY_O, KEYMOD_LALT | KEYMOD_SHIFT }, "show-open-documents" }, - { { KEY_K, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, - "open-workspace-symbol-search" }, - { { KEY_P, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, - "open-document-symbol-search" }, - { { KEY_N, KEYMOD_SHIFT | KEYMOD_LALT }, "create-new-window" }, + { { KEY_S, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "save-all" }, + { { KEY_F9, KEYMOD_LALT }, "switch-side-panel" }, + { { KEY_J, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, + "terminal-split-left" }, + { { KEY_L, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, + "terminal-split-right" }, + { { KEY_I, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, + "terminal-split-top" }, + { { KEY_K, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, + "terminal-split-bottom" }, + { { KEY_S, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, + "terminal-split-swap" }, + { { KEY_T, KeyMod::getDefaultModifier() | KEYMOD_LALT | KEYMOD_SHIFT }, + "reopen-closed-tab" }, + { { KEY_1, KEYMOD_LALT }, "toggle-status-locate-bar" }, + { { KEY_2, KEYMOD_LALT }, "toggle-status-global-search-bar" }, + { { KEY_3, KEYMOD_LALT }, "toggle-status-terminal" }, + { { KEY_4, KEYMOD_LALT }, "toggle-status-build-output" }, + { { KEY_B, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "project-build-start" }, + { { KEY_C, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "project-build-cancel" }, + { { KEY_O, KEYMOD_LALT | KEYMOD_SHIFT }, "show-open-documents" }, + { { KEY_K, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "open-workspace-symbol-search" }, + { { KEY_P, KeyMod::getDefaultModifier() | KEYMOD_SHIFT }, "open-document-symbol-search" }, + { { KEY_N, KEYMOD_SHIFT | KEYMOD_LALT }, "create-new-window" }, }; } @@ -2061,13 +2060,13 @@ std::map App::getLocalKeybindings() { std::map App::getMigrateKeybindings() { return { { "fullscreen-toggle", "alt+return" }, { "switch-to-tab-1", "alt+1" }, - { "switch-to-tab-2", "alt+2" }, { "switch-to-tab-3", "alt+3" }, - { "switch-to-tab-4", "alt+4" }, { "switch-to-tab-5", "alt+5" }, - { "switch-to-tab-6", "alt+6" }, { "switch-to-tab-7", "alt+7" }, - { "switch-to-tab-8", "alt+8" }, { "switch-to-tab-9", "alt+9" }, - { "switch-to-last-tab", "alt+0" }, + { "switch-to-tab-2", "alt+2" }, { "switch-to-tab-3", "alt+3" }, + { "switch-to-tab-4", "alt+4" }, { "switch-to-tab-5", "alt+5" }, + { "switch-to-tab-6", "alt+6" }, { "switch-to-tab-7", "alt+7" }, + { "switch-to-tab-8", "alt+8" }, { "switch-to-tab-9", "alt+9" }, + { "switch-to-last-tab", "alt+0" }, #if EE_PLATFORM == EE_PLATFORM_MACOS - { "menu-toggle", "mod+shift+m" }, + { "menu-toggle", "mod+shift+m" }, #endif }; } @@ -2245,7 +2244,7 @@ void App::createDocDirtyAlert( UICodeEditor* editor ) { docAlert->find( "file_autoreload" ) ->setVisible( !editor->getDocument().isDirty() ) - ->onClick( [editor, docAlert, this]( const MouseEvent* mouseEvent ) { + ->onClick( [editor, docAlert, this]( const MouseEvent* ) { editor->getDocument().reload(); editor->disableReportSizeChangeToChilds(); docAlert->close(); @@ -2254,22 +2253,21 @@ void App::createDocDirtyAlert( UICodeEditor* editor ) { mSettings->updateGlobalDocumentSettingsMenu(); } ); - docAlert->find( "file_reload" )->onClick( [editor, docAlert]( const MouseEvent* mouseEvent ) { + docAlert->find( "file_reload" )->onClick( [editor, docAlert]( const MouseEvent* ) { editor->getDocument().reload(); editor->disableReportSizeChangeToChilds(); docAlert->close(); editor->setFocus(); } ); - docAlert->find( "file_overwrite" ) - ->onClick( [editor, docAlert]( const MouseEvent* mouseEvent ) { - editor->getDocument().save(); - editor->disableReportSizeChangeToChilds(); - docAlert->close(); - editor->setFocus(); - } ); + docAlert->find( "file_overwrite" )->onClick( [editor, docAlert]( const MouseEvent* ) { + editor->getDocument().save(); + editor->disableReportSizeChangeToChilds(); + docAlert->close(); + editor->setFocus(); + } ); - docAlert->find( "file_ignore" )->onClick( [docAlert, editor]( const MouseEvent* mouseEvent ) { + docAlert->find( "file_ignore" )->onClick( [docAlert, editor]( const MouseEvent* ) { editor->disableReportSizeChangeToChilds(); docAlert->close(); editor->setFocus();