Skip to content
This repository was archived by the owner on Aug 12, 2018. It is now read-only.

Add Rust syntax highlighting #126

Open
roukaour wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Rust syntax highlighting #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c14eea6
Add Rust syntax highlighting
roukaour Aug 31, 2015
19b00b6
Merge remote-tracking branch 'upstream/master'
roukaour Sep 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/makefile.deps.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ $(SCI_LEX_OBJDIR)\LexPowerShell.obj: $(SCI_LEX)\LexPowerShell.cxx $(LEX_HEADERS)
$(SCI_LEX_OBJDIR)\LexProps.obj: $(SCI_LEX)\LexProps.cxx $(LEX_HEADERS)
$(SCI_LEX_OBJDIR)\LexPython.obj: $(SCI_LEX)\LexPython.cxx $(LEX_HEADERS)
$(SCI_LEX_OBJDIR)\LexRuby.obj: $(SCI_LEX)\LexRuby.cxx $(LEX_HEADERS)
$(SCI_LEX_OBJDIR)\LexRust.obj: $(SCI_LEX)\LexRust.cxx $(LEX_HEADERS)
$(SCI_LEX_OBJDIR)\LexSQL.obj: $(SCI_LEX)\LexSQL.cxx $(LEX_HEADERS) $(SCI_LIB)\OptionSet.h
$(SCI_LEX_OBJDIR)\LexTCL.obj: $(SCI_LEX)\LexTCL.cxx $(LEX_HEADERS)
$(SCI_LEX_OBJDIR)\LexVB.obj: $(SCI_LEX)\LexVB.cxx $(LEX_HEADERS)
Expand Down
1 change: 1 addition & 0 deletions build/makefile.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ SCI_LEX_OBJ = \
$(SCI_LEX_OBJDIR)\LexProps.obj \
$(SCI_LEX_OBJDIR)\LexPython.obj \
$(SCI_LEX_OBJDIR)\LexRuby.obj \
$(SCI_LEX_OBJDIR)\LexRust.obj \
$(SCI_LEX_OBJDIR)\LexSQL.obj \
$(SCI_LEX_OBJDIR)\LexTCL.obj \
$(SCI_LEX_OBJDIR)\LexVB.obj \
Expand Down
1 change: 1 addition & 0 deletions lexlink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"lmProps",
"lmPython",
"lmRuby",
"lmRust",
"lmSQL",
"lmTCL",
"lmVB",
Expand Down
1 change: 1 addition & 0 deletions scintilla/Scintilla.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
<ClCompile Include="lexers\LexProps.cxx" />
<ClCompile Include="lexers\LexPython.cxx" />
<ClCompile Include="lexers\LexRuby.cxx" />
<ClCompile Include="lexers\LexRust.cxx" />
<ClCompile Include="lexers\LexSQL.cxx" />
<ClCompile Include="lexers\LexTCL.cxx" />
<ClCompile Include="lexers\LexVB.cxx" />
Expand Down
3 changes: 3 additions & 0 deletions scintilla/Scintilla.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
<ClCompile Include="lexers\LexRuby.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexRust.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexSQL.cxx">
<Filter>lexers</Filter>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion scintilla/src/Catalogue.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ int Scintilla_LinkLexers() {
//LINK_LEXER(lmREBOL);
//LINK_LEXER(lmRegistry);
LINK_LEXER(lmRuby);
//LINK_LEXER(lmRust);
LINK_LEXER(lmRust);
//LINK_LEXER(lmScriptol);
//LINK_LEXER(lmSmalltalk);
//LINK_LEXER(lmSML);
Expand Down
5 changes: 3 additions & 2 deletions src/Notepad2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3388,6 +3388,7 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
case SCLEX_XML:
case SCLEX_CPP:
case SCLEX_PASCAL:
case SCLEX_RUST:
BeginWaitCursor();
EditToggleLineComments(hwndEdit,L"//",FALSE);
EndWaitCursor();
Expand Down Expand Up @@ -6248,7 +6249,7 @@ void ParseCommandLine()
LocalFree(lpSchemeArg);
lpSchemeArg = NULL;
}
iInitialLexer = 34;
iInitialLexer = 35;
flagLexerSpecified = 1;
break;

Expand All @@ -6257,7 +6258,7 @@ void ParseCommandLine()
LocalFree(lpSchemeArg);
lpSchemeArg = NULL;
}
iInitialLexer = 35;
iInitialLexer = 36;
flagLexerSpecified = 1;
break;

Expand Down
24 changes: 24 additions & 0 deletions src/Styles.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,29 @@ EDITLEXER lexRUBY = { SCLEX_RUBY, 63304, L"Ruby Script", L"rb; ruby; rbw; rake;
{ -1, 00000, L"", L"", L"" } } };


KEYWORDLIST KeyWords_RUST = {
"as break crate else enum extern false fn for if impl in let loop match mod move mut "
"pub ref return static self Self struct super true trait type unsafe use virtual "
"while continue box const where proc alignof become offsetof priv pure sizeof "
"typeof unsized yield do abstract final override macro",
"", "", "", "", "", "", "", "" };

EDITLEXER lexRUST = { SCLEX_RUST, 63363, L"Rust Source Code", L"rs", L"", &KeyWords_RUST, {
{ STYLE_DEFAULT, 63126, L"Default", L"", L"" },
//{ SCE_P_DEFAULT, L"Default", L"", L"" },
{ MULTI_STYLE(SCE_RUST_COMMENTLINE,SCE_RUST_COMMENTBLOCK,SCE_P_COMMENTLINE,SCE_P_COMMENTBLOCK), 63127, L"Comment", L"fore:#008000", L"" },
{ MULTI_STYLE(SCE_RUST_COMMENTLINEDOC,SCE_RUST_COMMENTBLOCKDOC,0,0), 63223, L"Doc Comment", L"fore:#008000", L"" },
{ SCE_RUST_WORD, 63128, L"Keyword", L"fore:#00007F", L"" },
{ SCE_RUST_IDENTIFIER, 63129, L"Identifier", L"", L"" },
{ SCE_RUST_NUMBER, 63130, L"Number", L"fore:#008080", L"" },
{ SCE_RUST_OPERATOR, 63132, L"Operator", L"", L"" },
{ MULTI_STYLE(SCE_RUST_STRING,SCE_RUST_STRINGR,SCE_RUST_BYTESTRING,SCE_RUST_BYTESTRINGR), 63131, L"String", L"fore:#FF8000", L"" },
{ MULTI_STYLE(SCE_RUST_CHARACTER,SCE_RUST_BYTECHARACTER,0,0), 63135, L"Character", L"fore:#FF8000", L"" },
{ SCE_RUST_LIFETIME, 63316, L"Lifetime", L"fore:#C0A030", L"" },
{ SCE_RUST_MACRO, 63133, L"Macro", L"fore:#0000FF", L"" },
{ -1, 00000, L"", L"", L"" } } };


KEYWORDLIST KeyWords_LUA = {
"and break do else elseif end false for function goto if "
"in local nil not or repeat return then true until while",
Expand Down Expand Up @@ -2485,6 +2508,7 @@ PEDITLEXER pLexArray[NUMLEXERS] =
&lexPY,
&lexRC,
&lexRUBY,
&lexRUST,
&lexBASH,
&lexSQL,
&lexTCL,
Expand Down
2 changes: 1 addition & 1 deletion src/Styles.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ typedef struct _editlexer


// Number of Lexers in pLexArray
#define NUMLEXERS 38
#define NUMLEXERS 39


void Style_Load();
Expand Down