Skip to content

Scintilla #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Scintilla #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8a247a
Stick to Scintilla coding style
csware Feb 21, 2019
88c7fd8
Add comments for Notepad2e additions and update Scintilla changelog
csware Feb 21, 2019
660933e
Naming convention
csware Feb 21, 2019
7c5afb7
Naming convention internal methods
csware Feb 21, 2019
cbb7434
Naming convention external methods
csware Feb 21, 2019
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
681 changes: 372 additions & 309 deletions doc/Scintilla_ChangeLog.md
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion lexlink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@
"lmSQL",
"lmVB",
"lmVBScript",
"lmXML"
"lmXML",
"lmAsn1", /* [n2e] */
"lmBash", /* [n2e] */
"lmCaml", /* [n2e] */
"lmCoffeeScript", /* [n2e] */
"lmD", /* [n2e] */
"lmLISP", /* [n2e] */
"lmTeX" /* [n2e] */
);

var fso = new ActiveXObject("Scripting.FileSystemObject");
Expand Down
4 changes: 3 additions & 1 deletion scintilla/include/SciLexer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
#define SCLEX_IHEX 118
#define SCLEX_TEHEX 119
#define SCLEX_JSON 120
#define SCLEX_AHK 200
#define SCLEX_AHK 200 // [n2e]: add AHK lexer
#define SCLEX_AUTOMATIC 1000
#define SCE_P_DEFAULT 0
#define SCE_P_COMMENTLINE 1
Expand Down Expand Up @@ -1525,6 +1525,7 @@
#define SCE_TXT2TAGS_OPTION 23
#define SCE_TXT2TAGS_PREPROC 24
#define SCE_TXT2TAGS_POSTPROC 25
// [n2e]: add AHK lexer
#define SCE_AHK_DEFAULT 0
#define SCE_AHK_COMMENTLINE 1
#define SCE_AHK_COMMENTBLOCK 2
Expand All @@ -1546,6 +1547,7 @@
#define SCE_AHK_WORD_UD 18
#define SCE_AHK_VARREFKW 19
#define SCE_AHK_ERROR 20
// [/n2e]
#define SCE_A68K_DEFAULT 0
#define SCE_A68K_COMMENT 1
#define SCE_A68K_NUMBER_DEC 2
Expand Down
22 changes: 13 additions & 9 deletions scintilla/include/Scintilla.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@

#include "Sci_Position.h"

typedef void ( * wheel_action ) ( int );
typedef int ( * key_action ) ( int , int );
// [n2e]: Implement wheel_action/proc_action
typedef void (*wheel_action) (int);
typedef int (*key_action)(int , int);
// [/n2e]: Implement wheel_action/proc_action
#ifdef __cplusplus
extern "C" {
#endif
Expand All @@ -25,8 +27,10 @@ int Scintilla_RegisterClasses(void *hInstance);
int Scintilla_ReleaseResources(void);
#endif
int Scintilla_LinkLexers(void);
// [n2e]: Implement wheel_action/proc_action
extern wheel_action n2e_wheel_action;
extern key_action n2e_proc_action;
// [/n2e]: Implement wheel_action/proc_action

#ifdef __cplusplus
}
Expand Down Expand Up @@ -663,7 +667,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_SEARCHANCHOR 2366
#define SCI_SEARCHNEXT 2367
#define SCI_SEARCHPREV 2368
#define SCI_MOVECARETONRCLICK 2369
#define SCI_N2E_MOVECARETONRCLICK 2369 // [n2e]: Implement Notepad's right click behavior #54
#define SCI_LINESONSCREEN 2370
#define SCI_USEPOPUP 2371
#define SCI_SELECTIONISRECTANGLE 2372
Expand All @@ -673,7 +677,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_ADDREFDOCUMENT 2376
#define SCI_RELEASEDOCUMENT 2377
#define SCI_GETMODEVENTMASK 2378
#define SCI_SETWORDNAVIGATIONMODE 2379
#define SCI_N2E_SETWORDNAVIGATIONMODE 2379 // [n2e]: ctrl+arrow behavior toggle #89
#define SCI_SETFOCUS 2380
#define SCI_GETFOCUS 2381
#define SC_STATUS_OK 0
Expand Down Expand Up @@ -984,8 +988,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_SETIDENTIFIERS 4024
#define SCI_DISTANCETOSECONDARYSTYLES 4025
#define SCI_GETSUBSTYLEBASES 4026
#define SCI_SETSKIPUIUPDATE 9000
#define SCI_SETDPI 9001
#define SCI_N2E_SETSKIPUIUPDATE 9000 // [n2e]: Increasingly slow to hex/base64/qp #142
#define SCI_N2E_SETDPI 9001 // [n2e]: DPI awareness #154
#define SC_MOD_INSERTTEXT 0x1
#define SC_MOD_DELETETEXT 0x2
#define SC_MOD_CHANGESTYLE 0x4
Expand Down Expand Up @@ -1077,8 +1081,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCN_FOCUSIN 2028
#define SCN_FOCUSOUT 2029
#define SCN_AUTOCCOMPLETED 2030
#define SCN_CARETMOVED 2031
#define SCN_LINECOUNTCHANGED 2032
#define SCN_N2E_CARETMOVED 2031 // [n2e]: "Scroll margin"-feature
#define SCN_N2E_LINECOUNTCHANGED 2032 // [n2e]: "Update gutter width"-feature
/* --Autogenerated -- end of section automatically generated from Scintilla.iface */

/* These structures are defined to be exactly the same shape as the Win32
Expand All @@ -1101,7 +1105,7 @@ struct Sci_TextRange {

struct Sci_TextToFind {
struct Sci_CharacterRange chrg;
char *lpstrText;
char *lpstrText; // [n2e]: EscapeHTML
struct Sci_CharacterRange chrgText;
};

Expand Down
234 changes: 117 additions & 117 deletions scintilla/src/Catalogue.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,123 +78,123 @@ int Scintilla_LinkLexers() {
//++Autogenerated -- run scripts/LexGen.py to regenerate
//**\(\tLINK_LEXER(\*);\n\)
//LINK_LEXER(lmA68k);
//LINK_LEXER(lmAbaqus);
//LINK_LEXER(lmAda);
//LINK_LEXER(lmAHK);
//LINK_LEXER(lmAPDL);
//LINK_LEXER(lmAs);
LINK_LEXER(lmAsm);
LINK_LEXER(lmAsn1);
//LINK_LEXER(lmASY);
LINK_LEXER(lmAU3);
//LINK_LEXER(lmAVE);
LINK_LEXER(lmAVS);
//LINK_LEXER(lmBaan);
LINK_LEXER(lmBash);
LINK_LEXER(lmBatch);
//LINK_LEXER(lmBibTeX);
//LINK_LEXER(lmBlitzBasic);
//LINK_LEXER(lmBullant);
LINK_LEXER(lmCaml);
//LINK_LEXER(lmClw);
//LINK_LEXER(lmClwNoCase);
LINK_LEXER(lmCmake);
//LINK_LEXER(lmCOBOL);
LINK_LEXER(lmCoffeeScript);
LINK_LEXER(lmConf);
LINK_LEXER(lmCPP);
LINK_LEXER(lmCPPNoCase);
//LINK_LEXER(lmCsound);
LINK_LEXER(lmCss);
LINK_LEXER(lmD);
LINK_LEXER(lmDiff);
//LINK_LEXER(lmDMAP);
//LINK_LEXER(lmDMIS);
//LINK_LEXER(lmECL);
//LINK_LEXER(lmEiffel);
//LINK_LEXER(lmEiffelkw);
//LINK_LEXER(lmErlang);
//LINK_LEXER(lmErrorList);
//LINK_LEXER(lmESCRIPT);
//LINK_LEXER(lmF77);
//LINK_LEXER(lmFlagShip);
//LINK_LEXER(lmForth);
//LINK_LEXER(lmFortran);
//LINK_LEXER(lmFreeBasic);
//LINK_LEXER(lmGAP);
//LINK_LEXER(lmGui4Cli);
//LINK_LEXER(lmHaskell);
LINK_LEXER(lmHTML);
//LINK_LEXER(lmIHex);
LINK_LEXER(lmInno);
//LINK_LEXER(lmJSON);
//LINK_LEXER(lmKix);
//LINK_LEXER(lmKVIrc);
LINK_LEXER(lmLatex);
LINK_LEXER(lmLISP);
//LINK_LEXER(lmLiterateHaskell);
//LINK_LEXER(lmLot);
//LINK_LEXER(lmLout);
LINK_LEXER(lmLua);
//LINK_LEXER(lmMagikSF);
LINK_LEXER(lmMake);
LINK_LEXER(lmMarkdown);
//LINK_LEXER(lmMatlab);
//LINK_LEXER(lmMETAPOST);
//LINK_LEXER(lmMMIXAL);
//LINK_LEXER(lmModula);
//LINK_LEXER(lmMSSQL);
//LINK_LEXER(lmMySQL);
//LINK_LEXER(lmNimrod);
//LINK_LEXER(lmNncrontab);
LINK_LEXER(lmNsis);
LINK_LEXER(lmNull);
//LINK_LEXER(lmOctave);
//LINK_LEXER(lmOpal);
//LINK_LEXER(lmOScript);
LINK_LEXER(lmPascal);
//LINK_LEXER(lmPB);
LINK_LEXER(lmPerl);
//LINK_LEXER(lmPHPSCRIPT);
//LINK_LEXER(lmPLM);
//LINK_LEXER(lmPO);
//LINK_LEXER(lmPOV);
//LINK_LEXER(lmPowerPro);
LINK_LEXER(lmPowerShell);
//LINK_LEXER(lmProgress);
LINK_LEXER(lmProps);
//LINK_LEXER(lmPS);
//LINK_LEXER(lmPureBasic);
LINK_LEXER(lmPython);
//LINK_LEXER(lmR);
//LINK_LEXER(lmREBOL);
//LINK_LEXER(lmRegistry);
LINK_LEXER(lmRuby);
LINK_LEXER(lmRust);
//LINK_LEXER(lmScriptol);
//LINK_LEXER(lmSmalltalk);
//LINK_LEXER(lmSML);
//LINK_LEXER(lmSorc);
//LINK_LEXER(lmSpecman);
//LINK_LEXER(lmSpice);
LINK_LEXER(lmSQL);
//LINK_LEXER(lmSrec);
//LINK_LEXER(lmSTTXT);
//LINK_LEXER(lmTACL);
//LINK_LEXER(lmTADS3);
//LINK_LEXER(lmTAL);
LINK_LEXER(lmTCL);
//LINK_LEXER(lmTCMD);
//LINK_LEXER(lmTEHex);
LINK_LEXER(lmTeX);
//LINK_LEXER(lmTxt2tags);
LINK_LEXER(lmVB);
LINK_LEXER(lmVBScript);
//LINK_LEXER(lmVerilog);
//LINK_LEXER(lmVHDL);
//LINK_LEXER(lmVisualProlog);
LINK_LEXER(lmXML);
LINK_LEXER(lmYAML);
//LINK_LEXER(lmAbaqus);
//LINK_LEXER(lmAda);
//LINK_LEXER(lmAHK);
//LINK_LEXER(lmAPDL);
//LINK_LEXER(lmAs);
LINK_LEXER(lmAsm);
LINK_LEXER(lmAsn1);
//LINK_LEXER(lmASY);
LINK_LEXER(lmAU3);
//LINK_LEXER(lmAVE);
LINK_LEXER(lmAVS);
//LINK_LEXER(lmBaan);
LINK_LEXER(lmBash);
LINK_LEXER(lmBatch);
//LINK_LEXER(lmBibTeX);
//LINK_LEXER(lmBlitzBasic);
//LINK_LEXER(lmBullant);
LINK_LEXER(lmCaml);
//LINK_LEXER(lmClw);
//LINK_LEXER(lmClwNoCase);
LINK_LEXER(lmCmake);
//LINK_LEXER(lmCOBOL);
LINK_LEXER(lmCoffeeScript);
LINK_LEXER(lmConf);
LINK_LEXER(lmCPP);
LINK_LEXER(lmCPPNoCase);
//LINK_LEXER(lmCsound);
LINK_LEXER(lmCss);
LINK_LEXER(lmD);
LINK_LEXER(lmDiff);
//LINK_LEXER(lmDMAP);
//LINK_LEXER(lmDMIS);
//LINK_LEXER(lmECL);
//LINK_LEXER(lmEiffel);
//LINK_LEXER(lmEiffelkw);
//LINK_LEXER(lmErlang);
//LINK_LEXER(lmErrorList);
//LINK_LEXER(lmESCRIPT);
//LINK_LEXER(lmF77);
//LINK_LEXER(lmFlagShip);
//LINK_LEXER(lmForth);
//LINK_LEXER(lmFortran);
//LINK_LEXER(lmFreeBasic);
//LINK_LEXER(lmGAP);
//LINK_LEXER(lmGui4Cli);
//LINK_LEXER(lmHaskell);
LINK_LEXER(lmHTML);
//LINK_LEXER(lmIHex);
LINK_LEXER(lmInno);
//LINK_LEXER(lmJSON);
//LINK_LEXER(lmKix);
//LINK_LEXER(lmKVIrc);
LINK_LEXER(lmLatex);
LINK_LEXER(lmLISP);
//LINK_LEXER(lmLiterateHaskell);
//LINK_LEXER(lmLot);
//LINK_LEXER(lmLout);
LINK_LEXER(lmLua);
//LINK_LEXER(lmMagikSF);
LINK_LEXER(lmMake);
LINK_LEXER(lmMarkdown);
//LINK_LEXER(lmMatlab);
//LINK_LEXER(lmMETAPOST);
//LINK_LEXER(lmMMIXAL);
//LINK_LEXER(lmModula);
//LINK_LEXER(lmMSSQL);
//LINK_LEXER(lmMySQL);
//LINK_LEXER(lmNimrod);
//LINK_LEXER(lmNncrontab);
LINK_LEXER(lmNsis);
LINK_LEXER(lmNull);
//LINK_LEXER(lmOctave);
//LINK_LEXER(lmOpal);
//LINK_LEXER(lmOScript);
LINK_LEXER(lmPascal);
//LINK_LEXER(lmPB);
LINK_LEXER(lmPerl);
//LINK_LEXER(lmPHPSCRIPT);
//LINK_LEXER(lmPLM);
//LINK_LEXER(lmPO);
//LINK_LEXER(lmPOV);
//LINK_LEXER(lmPowerPro);
LINK_LEXER(lmPowerShell);
//LINK_LEXER(lmProgress);
LINK_LEXER(lmProps);
//LINK_LEXER(lmPS);
//LINK_LEXER(lmPureBasic);
LINK_LEXER(lmPython);
//LINK_LEXER(lmR);
//LINK_LEXER(lmREBOL);
//LINK_LEXER(lmRegistry);
LINK_LEXER(lmRuby);
LINK_LEXER(lmRust);
//LINK_LEXER(lmScriptol);
//LINK_LEXER(lmSmalltalk);
//LINK_LEXER(lmSML);
//LINK_LEXER(lmSorc);
//LINK_LEXER(lmSpecman);
//LINK_LEXER(lmSpice);
LINK_LEXER(lmSQL);
//LINK_LEXER(lmSrec);
//LINK_LEXER(lmSTTXT);
//LINK_LEXER(lmTACL);
//LINK_LEXER(lmTADS3);
//LINK_LEXER(lmTAL);
LINK_LEXER(lmTCL);
//LINK_LEXER(lmTCMD);
//LINK_LEXER(lmTEHex);
LINK_LEXER(lmTeX);
//LINK_LEXER(lmTxt2tags);
LINK_LEXER(lmVB);
LINK_LEXER(lmVBScript);
//LINK_LEXER(lmVerilog);
//LINK_LEXER(lmVHDL);
//LINK_LEXER(lmVisualProlog);
LINK_LEXER(lmXML);
LINK_LEXER(lmYAML);

//--Autogenerated -- end of automatically generated section

Expand Down
Loading