mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-10-26 09:03:51 +01:00
a61b03ea88
Update with https://www.scintilla.org/scintilla521.zip https://www.scintilla.org/lexilla515.zip - fix setting to bring Scintilla::PositionCR from ScintillaStructures.h inline with Sci_Position.h Sci_PositionCR - add workaround to enable lexer for searchResult commented out SCI_SETILEXER call on searchResult to get one result which is correctly handled by the lexer, added comment about the current problem with property @MarkingsStruct which seems to disappear after call to SCI_SETILEXER or CreateLexer - corrected usage of ObjC lexer - removed unnecessary filter stuff - use own sections for scintilla and lexilla build targets and allow parallel builds - as libscilex is no longer existing, changed to libscintilla - adapt makefiles and cmake - use VS2019 - started simple changes for createlexer adaptations, nullpointercheck missing on return of lexer name from deprecated LexerNameFromID -> undefined behaviour - movement from id -> lexer name, mostly done via LexerNameFromID + switching off corresponding compiler warning - changed to SCI_SETILEXER from SCI_SETLEXER, SCI_SETLEXERLANGUAGE needs to be corrected, see Scintilla5Migration.html - just commented out: SCI_LOADLEXERLIBRARY Fix #10504, close #11419
77 lines
2.2 KiB
C++
77 lines
2.2 KiB
C++
// Scintilla source code edit control
|
|
/** @file Accessor.cxx
|
|
** Interfaces between Scintilla and lexers.
|
|
**/
|
|
// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
|
|
// The License.txt file describes the conditions under which this software may be distributed.
|
|
|
|
#include <cstdlib>
|
|
#include <cassert>
|
|
|
|
#include <string>
|
|
#include <string_view>
|
|
|
|
#include "ILexer.h"
|
|
#include "Scintilla.h"
|
|
#include "SciLexer.h"
|
|
|
|
#include "PropSetSimple.h"
|
|
#include "WordList.h"
|
|
#include "LexAccessor.h"
|
|
#include "Accessor.h"
|
|
|
|
using namespace Lexilla;
|
|
|
|
Accessor::Accessor(Scintilla::IDocument *pAccess_, PropSetSimple *pprops_) : LexAccessor(pAccess_), pprops(pprops_) {
|
|
}
|
|
|
|
int Accessor::GetPropertyInt(std::string_view key, int defaultValue) const {
|
|
return pprops->GetInt(key, defaultValue);
|
|
}
|
|
|
|
int Accessor::IndentAmount(Sci_Position line, int *flags, PFNIsCommentLeader pfnIsCommentLeader) {
|
|
const Sci_Position end = Length();
|
|
int spaceFlags = 0;
|
|
|
|
// Determines the indentation level of the current line and also checks for consistent
|
|
// indentation compared to the previous line.
|
|
// Indentation is judged consistent when the indentation whitespace of each line lines
|
|
// the same or the indentation of one line is a prefix of the other.
|
|
|
|
Sci_Position pos = LineStart(line);
|
|
char ch = (*this)[pos];
|
|
int indent = 0;
|
|
bool inPrevPrefix = line > 0;
|
|
Sci_Position posPrev = inPrevPrefix ? LineStart(line-1) : 0;
|
|
while ((ch == ' ' || ch == '\t') && (pos < end)) {
|
|
if (inPrevPrefix) {
|
|
const char chPrev = (*this)[posPrev++];
|
|
if (chPrev == ' ' || chPrev == '\t') {
|
|
if (chPrev != ch)
|
|
spaceFlags |= wsInconsistent;
|
|
} else {
|
|
inPrevPrefix = false;
|
|
}
|
|
}
|
|
if (ch == ' ') {
|
|
spaceFlags |= wsSpace;
|
|
indent++;
|
|
} else { // Tab
|
|
spaceFlags |= wsTab;
|
|
if (spaceFlags & wsSpace)
|
|
spaceFlags |= wsSpaceTab;
|
|
indent = (indent / 8 + 1) * 8;
|
|
}
|
|
ch = (*this)[++pos];
|
|
}
|
|
|
|
*flags = spaceFlags;
|
|
indent += SC_FOLDLEVELBASE;
|
|
// if completely empty line or the start of a comment...
|
|
if ((LineStart(line) == Length()) || (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r') ||
|
|
(pfnIsCommentLeader && (*pfnIsCommentLeader)(*this, pos, end-pos)))
|
|
return indent | SC_FOLDLEVELWHITEFLAG;
|
|
else
|
|
return indent;
|
|
}
|