Update to Scintilla5 (#2867)
commit7694aa5acb730fb7d0bbd1b4212140e63d315215
authorThomas Martitz <thomas.martitz@mailbox.org>
Sat, 9 Oct 2021 23:46:37 +0000 (10 01:46 +0200)
committerGitHub <noreply@github.com>
Sat, 9 Oct 2021 23:46:37 +0000 (10 09:46 +1000)
treecae6905b92c27761bb672e474323634381cab57a
parent11a1f32fd490b3918d069f0d05cca5bbc6c4b5ad
Update to Scintilla5  (#2867)

* Update Scintilla to version 5.1.1

A few notes:
- C++17 is required
  Not exactly new since we already imported the latest julia lexer.
- upstream split out lexers into a lexilla library
  We do "comply" by building a separate static library. So in effect, all
  lexers are built-in like before. In the future it may be possible to add
  lexer plugins at runtime.
- Lexer IDs are deprecated in favor of names
  For now we use LexerNameFromID() to map IDs to names but we should
  transition to names soon.
  That being said, the upstream transition seems also not complete.
  There is no name-based version of SCI_GETLEXER, so we're stuck with IDs
  there.

Closes #2824

* Update scintilla_changes.patch

The "which lexers" part is now a separate function that should be less
of a pain when updating to scintilla version that adds lexers.

* Update update-scintilla.sh

You need to extract lexilla sources too now and pass it to the script.
Also the script calls dos2unix for the files, kill that CRLF!
184 files changed:
configure.ac
plugins/Makefile.am
scintilla/License.txt
scintilla/Makefile.am
scintilla/gtk/PlatGTK.cxx
scintilla/gtk/ScintillaGTK.cxx
scintilla/gtk/ScintillaGTK.h
scintilla/gtk/ScintillaGTKAccessible.cxx
scintilla/gtk/ScintillaGTKAccessible.h
scintilla/include/Compat.h [deleted file]
scintilla/include/ILexer.h
scintilla/include/ILoader.h
scintilla/include/Makefile.am [deleted file]
scintilla/include/Platform.h [deleted file]
scintilla/include/Scintilla.h
scintilla/include/Scintilla.iface
scintilla/include/ScintillaCall.h [new file with mode: 0644]
scintilla/include/ScintillaMessages.h [new file with mode: 0644]
scintilla/include/ScintillaStructures.h [new file with mode: 0644]
scintilla/include/ScintillaTypes.h [new file with mode: 0644]
scintilla/julia_lexilla_v5.patch [deleted file]
scintilla/lexilla/License.txt [copied from scintilla/License.txt with 84% similarity]
scintilla/lexilla/include/LexicalStyles.iface [new file with mode: 0644]
scintilla/lexilla/include/Lexilla.h [new file with mode: 0644]
scintilla/lexilla/include/SciLexer.h [moved from scintilla/include/SciLexer.h with 98% similarity]
scintilla/lexilla/lexers/LexAbaqus.cxx [moved from scintilla/lexers/LexAbaqus.cxx with 99% similarity]
scintilla/lexilla/lexers/LexAda.cxx [moved from scintilla/lexers/LexAda.cxx with 99% similarity]
scintilla/lexilla/lexers/LexAsm.cxx [moved from scintilla/lexers/LexAsm.cxx with 98% similarity]
scintilla/lexilla/lexers/LexBash.cxx [moved from scintilla/lexers/LexBash.cxx with 99% similarity]
scintilla/lexilla/lexers/LexBasic.cxx [moved from scintilla/lexers/LexBasic.cxx with 98% similarity]
scintilla/lexilla/lexers/LexBatch.cxx [moved from scintilla/lexers/LexBatch.cxx with 91% similarity]
scintilla/lexilla/lexers/LexCOBOL.cxx [moved from scintilla/lexers/LexCOBOL.cxx with 99% similarity]
scintilla/lexilla/lexers/LexCPP.cxx [moved from scintilla/lexers/LexCPP.cxx with 94% similarity]
scintilla/lexilla/lexers/LexCSS.cxx [moved from scintilla/lexers/LexCSS.cxx with 99% similarity]
scintilla/lexilla/lexers/LexCaml.cxx [moved from scintilla/lexers/LexCaml.cxx with 73% similarity]
scintilla/lexilla/lexers/LexCmake.cxx [moved from scintilla/lexers/LexCmake.cxx with 99% similarity]
scintilla/lexilla/lexers/LexCoffeeScript.cxx [moved from scintilla/lexers/LexCoffeeScript.cxx with 99% similarity]
scintilla/lexilla/lexers/LexD.cxx [moved from scintilla/lexers/LexD.cxx with 98% similarity]
scintilla/lexilla/lexers/LexDiff.cxx [moved from scintilla/lexers/LexDiff.cxx with 98% similarity]
scintilla/lexilla/lexers/LexErlang.cxx [moved from scintilla/lexers/LexErlang.cxx with 98% similarity]
scintilla/lexilla/lexers/LexForth.cxx [moved from scintilla/lexers/LexForth.cxx with 98% similarity]
scintilla/lexilla/lexers/LexFortran.cxx [moved from scintilla/lexers/LexFortran.cxx with 99% similarity]
scintilla/lexilla/lexers/LexHTML.cxx [moved from scintilla/lexers/LexHTML.cxx with 97% similarity]
scintilla/lexilla/lexers/LexHaskell.cxx [moved from scintilla/lexers/LexHaskell.cxx with 99% similarity]
scintilla/lexilla/lexers/LexJulia.cxx [moved from scintilla/lexers/LexJulia.cxx with 99% similarity]
scintilla/lexilla/lexers/LexLaTeX.cxx [moved from scintilla/lexers/LexLaTeX.cxx with 99% similarity]
scintilla/lexilla/lexers/LexLisp.cxx [moved from scintilla/lexers/LexLisp.cxx with 99% similarity]
scintilla/lexilla/lexers/LexLua.cxx [moved from scintilla/lexers/LexLua.cxx with 93% similarity]
scintilla/lexilla/lexers/LexMake.cxx [moved from scintilla/lexers/LexMake.cxx with 98% similarity]
scintilla/lexilla/lexers/LexMarkdown.cxx [moved from scintilla/lexers/LexMarkdown.cxx with 87% similarity]
scintilla/lexilla/lexers/LexMatlab.cxx [moved from scintilla/lexers/LexMatlab.cxx with 99% similarity]
scintilla/lexilla/lexers/LexNsis.cxx [moved from scintilla/lexers/LexNsis.cxx with 99% similarity]
scintilla/lexilla/lexers/LexNull.cxx [moved from scintilla/lexers/LexNull.cxx with 94% similarity]
scintilla/lexilla/lexers/LexPO.cxx [moved from scintilla/lexers/LexPO.cxx with 98% similarity]
scintilla/lexilla/lexers/LexPascal.cxx [moved from scintilla/lexers/LexPascal.cxx with 99% similarity]
scintilla/lexilla/lexers/LexPerl.cxx [moved from scintilla/lexers/LexPerl.cxx with 99% similarity]
scintilla/lexilla/lexers/LexPowerShell.cxx [moved from scintilla/lexers/LexPowerShell.cxx with 99% similarity]
scintilla/lexilla/lexers/LexProps.cxx [moved from scintilla/lexers/LexProps.cxx with 99% similarity]
scintilla/lexilla/lexers/LexPython.cxx [moved from scintilla/lexers/LexPython.cxx with 99% similarity]
scintilla/lexilla/lexers/LexR.cxx [moved from scintilla/lexers/LexR.cxx with 98% similarity]
scintilla/lexilla/lexers/LexRuby.cxx [moved from scintilla/lexers/LexRuby.cxx with 98% similarity]
scintilla/lexilla/lexers/LexRust.cxx [moved from scintilla/lexers/LexRust.cxx with 99% similarity]
scintilla/lexilla/lexers/LexSQL.cxx [moved from scintilla/lexers/LexSQL.cxx with 99% similarity]
scintilla/lexilla/lexers/LexSmalltalk.cxx [moved from scintilla/lexers/LexSmalltalk.cxx with 99% similarity]
scintilla/lexilla/lexers/LexTCL.cxx [moved from scintilla/lexers/LexTCL.cxx with 98% similarity]
scintilla/lexilla/lexers/LexTxt2tags.cxx [moved from scintilla/lexers/LexTxt2tags.cxx with 99% similarity]
scintilla/lexilla/lexers/LexVHDL.cxx [moved from scintilla/lexers/LexVHDL.cxx with 99% similarity]
scintilla/lexilla/lexers/LexVerilog.cxx [moved from scintilla/lexers/LexVerilog.cxx with 99% similarity]
scintilla/lexilla/lexers/LexYAML.cxx [moved from scintilla/lexers/LexYAML.cxx with 96% similarity]
scintilla/lexilla/lexlib/Accessor.cxx [moved from scintilla/lexlib/Accessor.cxx with 88% similarity]
scintilla/lexilla/lexlib/Accessor.h [moved from scintilla/lexlib/Accessor.h with 81% similarity]
scintilla/lexilla/lexlib/CatalogueModules.h [moved from scintilla/lexlib/CatalogueModules.h with 88% similarity]
scintilla/lexilla/lexlib/CharacterCategory.cxx [copied from scintilla/lexlib/CharacterCategory.cxx with 97% similarity]
scintilla/lexilla/lexlib/CharacterCategory.h [copied from scintilla/lexlib/CharacterCategory.h with 98% similarity]
scintilla/lexilla/lexlib/CharacterSet.cxx [copied from scintilla/lexlib/CharacterSet.cxx with 95% similarity]
scintilla/lexilla/lexlib/CharacterSet.h [moved from scintilla/lexlib/CharacterSet.h with 67% similarity]
scintilla/lexilla/lexlib/DefaultLexer.cxx [moved from scintilla/lexlib/DefaultLexer.cxx with 95% similarity]
scintilla/lexilla/lexlib/DefaultLexer.h [moved from scintilla/lexlib/DefaultLexer.h with 91% similarity]
scintilla/lexilla/lexlib/LexAccessor.cxx [new file with mode: 0644]
scintilla/lexilla/lexlib/LexAccessor.h [moved from scintilla/lexlib/LexAccessor.h with 82% similarity]
scintilla/lexilla/lexlib/LexerBase.cxx [moved from scintilla/lexlib/LexerBase.cxx with 94% similarity]
scintilla/lexilla/lexlib/LexerBase.h [moved from scintilla/lexlib/LexerBase.h with 91% similarity]
scintilla/lexilla/lexlib/LexerModule.cxx [moved from scintilla/lexlib/LexerModule.cxx with 96% similarity]
scintilla/lexilla/lexlib/LexerModule.h [moved from scintilla/lexlib/LexerModule.h with 94% similarity]
scintilla/lexilla/lexlib/LexerNoExceptions.cxx [moved from scintilla/lexlib/LexerNoExceptions.cxx with 89% similarity]
scintilla/lexilla/lexlib/LexerNoExceptions.h [moved from scintilla/lexlib/LexerNoExceptions.h with 76% similarity]
scintilla/lexilla/lexlib/LexerSimple.cxx [moved from scintilla/lexlib/LexerSimple.cxx with 89% similarity]
scintilla/lexilla/lexlib/LexerSimple.h [moved from scintilla/lexlib/LexerSimple.h with 82% similarity]
scintilla/lexilla/lexlib/OptionSet.h [moved from scintilla/lexlib/OptionSet.h with 97% similarity]
scintilla/lexilla/lexlib/PropSetSimple.cxx [new file with mode: 0644]
scintilla/lexilla/lexlib/PropSetSimple.h [new file with mode: 0644]
scintilla/lexilla/lexlib/SparseState.h [moved from scintilla/lexlib/SparseState.h with 99% similarity]
scintilla/lexilla/lexlib/StringCopy.h [moved from scintilla/lexlib/StringCopy.h with 97% similarity]
scintilla/lexilla/lexlib/StyleContext.cxx [moved from scintilla/lexlib/StyleContext.cxx with 55% similarity]
scintilla/lexilla/lexlib/StyleContext.h [moved from scintilla/lexlib/StyleContext.h with 95% similarity]
scintilla/lexilla/lexlib/SubStyles.h [moved from scintilla/lexlib/SubStyles.h with 79% similarity]
scintilla/lexilla/lexlib/WordList.cxx [moved from scintilla/lexlib/WordList.cxx with 99% similarity]
scintilla/lexilla/lexlib/WordList.h [moved from scintilla/lexlib/WordList.h with 97% similarity]
scintilla/lexilla/src/Lexilla.cxx [new file with mode: 0644]
scintilla/lexilla/version.txt [new file with mode: 0644]
scintilla/lexlib/PropSetSimple.cxx [deleted file]
scintilla/lexlib/PropSetSimple.h [deleted file]
scintilla/scintilla_changes.patch
scintilla/src/AutoComplete.cxx
scintilla/src/AutoComplete.h
scintilla/src/CallTip.cxx
scintilla/src/CallTip.h
scintilla/src/CaseConvert.cxx
scintilla/src/CaseConvert.h
scintilla/src/CaseFolder.cxx
scintilla/src/CaseFolder.h
scintilla/src/Catalogue.cxx [deleted file]
scintilla/src/Catalogue.h [deleted file]
scintilla/src/CellBuffer.cxx
scintilla/src/CellBuffer.h
scintilla/src/CharClassify.cxx
scintilla/src/CharClassify.h
scintilla/src/CharacterCategoryMap.cxx [moved from scintilla/lexlib/CharacterCategory.cxx with 96% similarity]
scintilla/src/CharacterCategoryMap.h [moved from scintilla/lexlib/CharacterCategory.h with 80% similarity]
scintilla/src/CharacterType.cxx [moved from scintilla/lexlib/CharacterSet.cxx with 83% similarity]
scintilla/src/CharacterType.h [new file with mode: 0644]
scintilla/src/ContractionState.cxx
scintilla/src/ContractionState.h
scintilla/src/DBCS.cxx
scintilla/src/DBCS.h
scintilla/src/Debugging.h [new file with mode: 0644]
scintilla/src/Decoration.cxx
scintilla/src/Decoration.h
scintilla/src/Document.cxx
scintilla/src/Document.h
scintilla/src/EditModel.cxx
scintilla/src/EditModel.h
scintilla/src/EditView.cxx
scintilla/src/EditView.h
scintilla/src/Editor.cxx
scintilla/src/Editor.h
scintilla/src/ElapsedPeriod.h
scintilla/src/ExternalLexer.cxx [deleted file]
scintilla/src/ExternalLexer.h [deleted file]
scintilla/src/FontQuality.h
scintilla/src/Geometry.cxx [new file with mode: 0644]
scintilla/src/Geometry.h [new file with mode: 0644]
scintilla/src/Indicator.cxx
scintilla/src/Indicator.h
scintilla/src/IntegerRectangle.h [deleted file]
scintilla/src/KeyMap.cxx
scintilla/src/KeyMap.h
scintilla/src/LineMarker.cxx
scintilla/src/LineMarker.h
scintilla/src/MarginView.cxx
scintilla/src/MarginView.h
scintilla/src/Partitioning.h
scintilla/src/PerLine.cxx
scintilla/src/PerLine.h
scintilla/src/Platform.h [new file with mode: 0644]
scintilla/src/Position.h
scintilla/src/PositionCache.cxx
scintilla/src/PositionCache.h
scintilla/src/RESearch.cxx
scintilla/src/RESearch.h
scintilla/src/RunStyles.cxx
scintilla/src/RunStyles.h
scintilla/src/SVector.h [deleted file]
scintilla/src/ScintillaBase.cxx
scintilla/src/ScintillaBase.h
scintilla/src/Selection.cxx
scintilla/src/Selection.h
scintilla/src/SparseVector.h
scintilla/src/SplitVector.h
scintilla/src/Style.cxx
scintilla/src/Style.h
scintilla/src/UniConversion.cxx
scintilla/src/UniConversion.h
scintilla/src/UnicodeFromUTF8.h [deleted file]
scintilla/src/UniqueString.cxx
scintilla/src/UniqueString.h
scintilla/src/ViewStyle.cxx
scintilla/src/ViewStyle.h
scintilla/src/XPM.cxx
scintilla/src/XPM.h
scintilla/version.txt
scripts/update-scintilla.sh
src/Makefile.am
src/sciwrappers.c