tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change name of programming language from Nimrod to Nim 

Fix #9768
This commit is contained in:
Don HO 2021-04-15 03:40:30 +02:00
parent 94dffc6da8
commit af56713079
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
View File

@ -31,7 +31,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
L_IHEX, L_TEHEX, L_SWIFT,\ L_IHEX, L_TEHEX, L_SWIFT,\
L_ASN1, L_AVS, L_BLITZBASIC, L_PUREBASIC, L_FREEBASIC, \ L_ASN1, L_AVS, L_BLITZBASIC, L_PUREBASIC, L_FREEBASIC, \
L_CSOUND, L_ERLANG, L_ESCRIPT, L_FORTH, L_LATEX, \ L_CSOUND, L_ERLANG, L_ESCRIPT, L_FORTH, L_LATEX, \
L_MMIXAL, L_NIMROD, L_NNCRONTAB, L_OSCRIPT, L_REBOL, \ L_MMIXAL, L_NIM, L_NNCRONTAB, L_OSCRIPT, L_REBOL, \
L_REGISTRY, L_RUST, L_SPICE, L_TXT2TAGS, L_VISUALPROLOG,\ L_REGISTRY, L_RUST, L_SPICE, L_TXT2TAGS, L_VISUALPROLOG,\
// Don't use L_JS, use L_JAVASCRIPT instead // Don't use L_JS, use L_JAVASCRIPT instead
// The end of enumated language type, so it should be always at the end // The end of enumated language type, so it should be always at the end

4
PowerEditor/src/Notepad_plus.cpp
View File

@ -3413,8 +3413,8 @@ LangType Notepad_plus::menuID2LangType(int cmdID)
return L_LATEX; return L_LATEX;
case IDM_LANG_MMIXAL : case IDM_LANG_MMIXAL :
return L_MMIXAL; return L_MMIXAL;
case IDM_LANG_NIMROD : case IDM_LANG_NIM :
return L_NIMROD; return L_NIM;
case IDM_LANG_NNCRONTAB : case IDM_LANG_NNCRONTAB :
return L_NNCRONTAB; return L_NNCRONTAB;
case IDM_LANG_OSCRIPT : case IDM_LANG_OSCRIPT :

4
PowerEditor/src/Notepad_plus.rc
View File

@ -760,7 +760,7 @@ BEGIN
MENUITEM "Matlab", IDM_LANG_MATLAB MENUITEM "Matlab", IDM_LANG_MATLAB
MENUITEM "MMIXAL", IDM_LANG_MMIXAL MENUITEM "MMIXAL", IDM_LANG_MMIXAL
MENUITEM "MS-DOS Style", IDM_LANG_ASCII MENUITEM "MS-DOS Style", IDM_LANG_ASCII
MENUITEM "Nimrod", IDM_LANG_NIMROD MENUITEM "Nim", IDM_LANG_NIM
MENUITEM "Nncrontab", IDM_LANG_NNCRONTAB MENUITEM "Nncrontab", IDM_LANG_NNCRONTAB
MENUITEM "NSIS", IDM_LANG_NSIS MENUITEM "NSIS", IDM_LANG_NSIS
MENUITEM "Objective-C", IDM_LANG_OBJC MENUITEM "Objective-C", IDM_LANG_OBJC
@ -886,7 +886,7 @@ BEGIN
END END
POPUP "N" POPUP "N"
BEGIN BEGIN
MENUITEM "Nimrod", IDM_LANG_NIMROD MENUITEM "Nim", IDM_LANG_NIM
MENUITEM "Nncrontab", IDM_LANG_NNCRONTAB MENUITEM "Nncrontab", IDM_LANG_NNCRONTAB
MENUITEM "NSIS", IDM_LANG_NSIS MENUITEM "NSIS", IDM_LANG_NSIS
END END

2
PowerEditor/src/NppCommands.cpp
View File

@ -3265,7 +3265,7 @@ void Notepad_plus::command(int id)
case IDM_LANG_FORTH : case IDM_LANG_FORTH :
case IDM_LANG_LATEX : case IDM_LANG_LATEX :
case IDM_LANG_MMIXAL : case IDM_LANG_MMIXAL :
case IDM_LANG_NIMROD : case IDM_LANG_NIM :
case IDM_LANG_NNCRONTAB : case IDM_LANG_NNCRONTAB :
case IDM_LANG_OSCRIPT : case IDM_LANG_OSCRIPT :
case IDM_LANG_REBOL : case IDM_LANG_REBOL :

4
PowerEditor/src/Parameters.cpp
View File

@ -6754,8 +6754,8 @@ int NppParameters::langTypeToCommandID(LangType lt) const
case L_MMIXAL : case L_MMIXAL :
id = IDM_LANG_MMIXAL; break; id = IDM_LANG_MMIXAL; break;
case L_NIMROD : case L_NIM :
id = IDM_LANG_NIMROD; break; id = IDM_LANG_NIM; break;
case L_NNCRONTAB : case L_NNCRONTAB :
id = IDM_LANG_NNCRONTAB; break; id = IDM_LANG_NNCRONTAB; break;

4
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -146,7 +146,7 @@ LanguageName ScintillaEditView::langNames[L_EXTERNAL+1] = {
{TEXT("forth"), TEXT("Forth"), TEXT("Forth file"), L_FORTH, SCLEX_FORTH}, {TEXT("forth"), TEXT("Forth"), TEXT("Forth file"), L_FORTH, SCLEX_FORTH},
{TEXT("latex"), TEXT("LaTeX"), TEXT("LaTeX file"), L_LATEX, SCLEX_LATEX}, {TEXT("latex"), TEXT("LaTeX"), TEXT("LaTeX file"), L_LATEX, SCLEX_LATEX},
{TEXT("mmixal"), TEXT("MMIXAL"), TEXT("MMIXAL file"), L_MMIXAL, SCLEX_MMIXAL}, {TEXT("mmixal"), TEXT("MMIXAL"), TEXT("MMIXAL file"), L_MMIXAL, SCLEX_MMIXAL},
{TEXT("nimrod"), TEXT("Nimrod"), TEXT("Nimrod file"), L_NIMROD, SCLEX_NIMROD}, {TEXT("nim"), TEXT("Nim"), TEXT("Nim file"), L_NIM, SCLEX_NIMROD},
{TEXT("nncrontab"), TEXT("Nncrontab"), TEXT("extended crontab file"), L_NNCRONTAB, SCLEX_NNCRONTAB}, {TEXT("nncrontab"), TEXT("Nncrontab"), TEXT("extended crontab file"), L_NNCRONTAB, SCLEX_NNCRONTAB},
{TEXT("oscript"), TEXT("OScript"), TEXT("OScript source file"), L_OSCRIPT, SCLEX_OSCRIPT}, {TEXT("oscript"), TEXT("OScript"), TEXT("OScript source file"), L_OSCRIPT, SCLEX_OSCRIPT},
{TEXT("rebol"), TEXT("REBOL"), TEXT("REBOL file"), L_REBOL, SCLEX_REBOL}, {TEXT("rebol"), TEXT("REBOL"), TEXT("REBOL file"), L_REBOL, SCLEX_REBOL},
@ -1708,7 +1708,7 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
case L_MMIXAL : case L_MMIXAL :
setMMIXALLexer(); break; setMMIXALLexer(); break;
case L_NIMROD : case L_NIM :
setNimrodLexer(); break; setNimrodLexer(); break;
case L_NNCRONTAB : case L_NNCRONTAB :

2
PowerEditor/src/ScintillaComponent/ScintillaEditView.h
View File

@ -920,7 +920,7 @@ protected:
}; };
void setNimrodLexer() { void setNimrodLexer() {
setLexer(SCLEX_NIMROD, L_NIMROD, LIST_0); setLexer(SCLEX_NIMROD, L_NIM, LIST_0);
}; };
void setNncrontabLexer() { void setNncrontabLexer() {

2
PowerEditor/src/langs.model.xml
View File

@ -229,7 +229,7 @@
<Keywords name="instre2">rA rB rC rD rE rF rG rH rI rJ rK rL rM rN rO rP rQ rR rS rT rU rV rW rX rY rZ rBB rTT rWW rXX rYY rZZ</Keywords> <Keywords name="instre2">rA rB rC rD rE rF rG rH rI rJ rK rL rM rN rO rP rQ rR rS rT rU rV rW rX rY rZ rBB rTT rWW rXX rYY rZZ</Keywords>
<Keywords name="type1">@ Text_Segment Data_Segment Pool_Segment Stack_Segment StdErr StdIn StdOut Fopen Fclose Fread Fwrite Fgets Fputs Fgetws Fputws Ftell Fseek TextRead TextWrite BinaryRead BinaryWrite BinaryReadWrite</Keywords> <Keywords name="type1">@ Text_Segment Data_Segment Pool_Segment Stack_Segment StdErr StdIn StdOut Fopen Fclose Fread Fwrite Fgets Fputs Fgetws Fputws Ftell Fseek TextRead TextWrite BinaryRead BinaryWrite BinaryReadWrite</Keywords>
</Language> </Language>
<Language name="nimrod" ext="nim" commentLine="#" commentStart="" commentEnd=""> <Language name="nim" ext="nim" commentLine="#" commentStart="" commentEnd="">
<Keywords name="instre1">addr and as asm block break case cast const continue converter discard div elif else end enum except exception finally for from generic if implies import in include is isnot iterator lambda macro method mod nil not notin object of or out proc ptr raise ref return shl shr template try tuple type var when where while with without xor yield</Keywords> <Keywords name="instre1">addr and as asm block break case cast const continue converter discard div elif else end enum except exception finally for from generic if implies import in include is isnot iterator lambda macro method mod nil not notin object of or out proc ptr raise ref return shl shr template try tuple type var when where while with without xor yield</Keywords>
</Language> </Language>
<Language name="nncrontab" ext="tab spf" commentLine="\" commentStart="" commentEnd=""> <Language name="nncrontab" ext="tab spf" commentLine="\" commentStart="" commentEnd="">

2
PowerEditor/src/menuCmdID.h
View File

@ -506,7 +506,7 @@
#define IDM_LANG_FORTH (IDM_LANG + 72) #define IDM_LANG_FORTH (IDM_LANG + 72)
#define IDM_LANG_LATEX (IDM_LANG + 73) #define IDM_LANG_LATEX (IDM_LANG + 73)
#define IDM_LANG_MMIXAL (IDM_LANG + 74) #define IDM_LANG_MMIXAL (IDM_LANG + 74)
#define IDM_LANG_NIMROD (IDM_LANG + 75) #define IDM_LANG_NIM (IDM_LANG + 75)
#define IDM_LANG_NNCRONTAB (IDM_LANG + 76) #define IDM_LANG_NNCRONTAB (IDM_LANG + 76)
#define IDM_LANG_OSCRIPT (IDM_LANG + 77) #define IDM_LANG_OSCRIPT (IDM_LANG + 77)
#define IDM_LANG_REBOL (IDM_LANG + 78) #define IDM_LANG_REBOL (IDM_LANG + 78)

2
PowerEditor/src/stylers.model.xml
View File

@ -760,7 +760,7 @@
<WordsStyle name="FUNCTION DEFINITIONS" styleID="17" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" /> <WordsStyle name="FUNCTION DEFINITIONS" styleID="17" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" />
<WordsStyle name="COMMENT" styleID="18" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" /> <WordsStyle name="COMMENT" styleID="18" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
</LexerType> </LexerType>
<LexerType name="nimrod" desc="Nimrod" ext=""> <LexerType name="nim" desc="Nim" ext="">
<WordsStyle name="WHITE SPACE" styleID="0" fgColor="808080" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" /> <WordsStyle name="WHITE SPACE" styleID="0" fgColor="808080" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
<WordsStyle name="COMMENT" styleID="1" fgColor="007F00" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" /> <WordsStyle name="COMMENT" styleID="1" fgColor="007F00" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
<WordsStyle name="NUMBER" styleID="2" fgColor="007F7F" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" /> <WordsStyle name="NUMBER" styleID="2" fgColor="007F7F" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />