diff options
| author | darmar <unknown> | 2018-05-02 08:36:12 +1000 |
|---|---|---|
| committer | darmar <unknown> | 2018-05-02 08:36:12 +1000 |
| commit | 13076f92442dd146095e482c27480031d76e446f (patch) | |
| tree | 61416f655b16777a55871e82c4e7cef31f390d3f | |
| parent | aecd6d653733ecd4518b6673c87ee20ebd3ee225 (diff) | |
| download | scintilla-mirror-13076f92442dd146095e482c27480031d76e446f.tar.gz | |
Backport: Add "change team" and "endteam" folding terms.
Backport of changeset 6781:6ededeebe34c.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexFortran.cxx | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 620b44aad..0cae52401 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -548,6 +548,10 @@ including line numbers. </li> <li> + Fortran folder understands "change team" and "endteam". + <a href="https://sourceforge.net/p/scintilla/feature-requests/1216/">Feature #1216.</a> + </li> + <li> Set the last X chosen when SCI_REPLACESEL called to ensure macros work when text insertion followed by caret up or down. </li> diff --git a/lexers/LexFortran.cxx b/lexers/LexFortran.cxx index 113b0585a..3adee5839 100644 --- a/lexers/LexFortran.cxx +++ b/lexers/LexFortran.cxx @@ -443,7 +443,7 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c || strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0 || strcmp(s, "endwhere") == 0 || strcmp(s, "endcritical") == 0 || (strcmp(prevWord, "module") == 0 && strcmp(s, "procedure") == 0) // Take care of the "module procedure" statement - || strcmp(s, "endsubmodule") == 0) { + || strcmp(s, "endsubmodule") == 0 || strcmp(s, "endteam") == 0) { lev = -1; } else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if lev = 0; @@ -452,6 +452,8 @@ static int classifyFoldPointFortran(const char* s, const char* prevWord, const c } else if ((strcmp(prevWord, "end") == 0 && strcmp(s, "procedure") == 0) || strcmp(s, "endprocedure") == 0) { lev = 1; // level back to 0, because no folding support for "module procedure" in submodule + } else if (strcmp(prevWord, "change") == 0 && strcmp(s, "team") == 0){ // change team + lev = 1; } return lev; } |