aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Document.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Document.h')
-rw-r--r--src/Document.h79
1 files changed, 34 insertions, 45 deletions
diff --git a/src/Document.h b/src/Document.h
index cbb91e574..5c9840463 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -8,7 +8,7 @@
#ifndef DOCUMENT_H
#define DOCUMENT_H
-namespace Scintilla {
+namespace Scintilla::Internal {
class DocWatcher;
class DocModification;
@@ -93,7 +93,7 @@ public:
virtual ~RegexSearchBase() {}
virtual Sci::Position FindText(Document *doc, Sci::Position minPos, Sci::Position maxPos, const char *s,
- bool caseSensitive, bool word, bool wordStart, int flags, Sci::Position *length) = 0;
+ bool caseSensitive, bool word, bool wordStart, Scintilla::FindOption flags, Sci::Position *length) = 0;
///@return String with the substitutions, must remain valid until the next call or destruction
virtual const char *SubstituteByPosition(Document *doc, const char *text, Sci::Position *length) = 0;
@@ -164,22 +164,10 @@ public:
bool isEnabled;
};
-constexpr int LevelNumber(int level) noexcept {
- return level & SC_FOLDLEVELNUMBERMASK;
-}
-
-constexpr bool LevelIsHeader(int level) noexcept {
- return (level & SC_FOLDLEVELHEADERFLAG) == SC_FOLDLEVELHEADERFLAG;
-}
-
-constexpr bool LevelIsWhitespace(int level) noexcept {
- return (level & SC_FOLDLEVELWHITEFLAG) == SC_FOLDLEVELWHITEFLAG;
-}
-
class LexInterface {
protected:
Document *pdoc;
- ILexer5 *instance;
+ Scintilla::ILexer5 *instance;
bool performingStyle; ///< Prevent reentrance
public:
explicit LexInterface(Document *pdoc_) noexcept : pdoc(pdoc_), instance(nullptr), performingStyle(false) {
@@ -187,7 +175,7 @@ public:
virtual ~LexInterface() {
}
void Colourise(Sci::Position start, Sci::Position end);
- virtual int LineEndTypesSupported();
+ virtual Scintilla::LineEndType LineEndTypesSupported();
bool UseContainerLexing() const noexcept {
return instance == nullptr;
}
@@ -220,7 +208,7 @@ public:
/**
*/
-class Document : PerLine, public IDocument, public ILoader {
+class Document : PerLine, public Scintilla::IDocument, public Scintilla::ILoader {
public:
/** Used to pair watcher pointer with user data. */
@@ -280,10 +268,10 @@ public:
}
};
- int eolMode;
+ Scintilla::EndOfLine eolMode;
/// Can also be SC_CP_UTF8 to enable UTF-8 mode
int dbcsCodePage;
- int lineEndBitSet;
+ Scintilla::LineEndType lineEndBitSet;
int tabInChars;
int indentInChars;
int actualIndentInChars;
@@ -294,7 +282,7 @@ public:
std::unique_ptr<IDecorationList> decorations;
- Document(int options);
+ Document(Scintilla::DocumentOption options);
// Deleted so Document objects can not be copied.
Document(const Document &) = delete;
Document(Document &&) = delete;
@@ -311,14 +299,14 @@ public:
void InsertLines(Sci::Line line, Sci::Line lines) override;
void RemoveLine(Sci::Line line) override;
- int LineEndTypesSupported() const;
+ Scintilla::LineEndType LineEndTypesSupported() const;
bool SetDBCSCodePage(int dbcsCodePage_);
- int GetLineEndTypesAllowed() const noexcept { return cb.GetLineEndTypes(); }
- bool SetLineEndTypesAllowed(int lineEndBitSet_);
- int GetLineEndTypesActive() const noexcept { return cb.GetLineEndTypes(); }
+ Scintilla::LineEndType GetLineEndTypesAllowed() const noexcept { return cb.GetLineEndTypes(); }
+ bool SetLineEndTypesAllowed(Scintilla::LineEndType lineEndBitSet_);
+ Scintilla::LineEndType GetLineEndTypesActive() const noexcept { return cb.GetLineEndTypes(); }
int SCI_METHOD Version() const override {
- return dvRelease4;
+ return Scintilla::dvRelease4;
}
void SCI_METHOD SetErrorStatus(int status) override;
@@ -387,12 +375,12 @@ public:
Sci::Position CountUTF16(Sci::Position startPos, Sci::Position endPos) const noexcept;
Sci::Position FindColumn(Sci::Line line, Sci::Position column);
void Indent(bool forwards, Sci::Line lineBottom, Sci::Line lineTop);
- static std::string TransformLineEnds(const char *s, size_t len, int eolModeWanted);
- void ConvertLineEnds(int eolModeSet);
+ static std::string TransformLineEnds(const char *s, size_t len, Scintilla::EndOfLine eolModeWanted);
+ void ConvertLineEnds(Scintilla::EndOfLine eolModeSet);
void SetReadOnly(bool set) { cb.SetReadOnly(set); }
bool IsReadOnly() const noexcept { return cb.IsReadOnly(); }
bool IsLarge() const noexcept { return cb.IsLarge(); }
- int Options() const noexcept;
+ Scintilla::DocumentOption Options() const noexcept;
void DelChar(Sci::Position pos);
void DelCharBack(Sci::Position pos);
@@ -423,14 +411,15 @@ public:
bool IsLineEndPosition(Sci::Position position) const;
bool IsPositionInLineEnd(Sci::Position position) const;
Sci::Position VCHomePosition(Sci::Position position) const;
- Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const noexcept;
- Sci::Line LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const noexcept;
+ Sci::Position IndexLineStart(Sci::Line line, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept;
+ Sci::Line LineFromPositionIndex(Sci::Position pos, Scintilla::LineCharacterIndexType lineCharacterIndex) const noexcept;
Sci::Line LineFromPositionAfter(Sci::Line line, Sci::Position length) const noexcept;
int SCI_METHOD SetLevel(Sci_Position line, int level) override;
int SCI_METHOD GetLevel(Sci_Position line) const override;
+ Scintilla::FoldLevel GetFoldLevel(Sci_Position line) const;
void ClearLevels();
- Sci::Line GetLastChild(Sci::Line lineParent, int level=-1, Sci::Line lastLine=-1);
+ Sci::Line GetLastChild(Sci::Line lineParent, std::optional<Scintilla::FoldLevel> level = {}, Sci::Line lastLine = -1);
Sci::Line GetFoldParent(Sci::Line line) const;
void GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, Sci::Line line, Sci::Line lastLine);
@@ -450,11 +439,11 @@ public:
bool MatchesWordOptions(bool word, bool wordStart, Sci::Position pos, Sci::Position length) const;
bool HasCaseFolder() const noexcept;
void SetCaseFolder(std::unique_ptr<CaseFolder> pcf_) noexcept;
- Sci::Position FindText(Sci::Position minPos, Sci::Position maxPos, const char *search, int flags, Sci::Position *length);
+ Sci::Position FindText(Sci::Position minPos, Sci::Position maxPos, const char *search, Scintilla::FindOption flags, Sci::Position *length);
const char *SubstituteByPosition(const char *text, Sci::Position *length);
- int LineCharacterIndex() const noexcept;
- void AllocateLineCharacterIndex(int lineCharacterIndex);
- void ReleaseLineCharacterIndex(int lineCharacterIndex);
+ Scintilla::LineCharacterIndexType LineCharacterIndex() const noexcept;
+ void AllocateLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
+ void ReleaseLineCharacterIndex(Scintilla::LineCharacterIndexType lineCharacterIndex);
Sci::Line LinesTotal() const noexcept;
void SetDefaultCharClasses(bool includeWordClass);
@@ -552,18 +541,18 @@ public:
*/
class DocModification {
public:
- int modificationType;
+ Scintilla::ModificationFlags modificationType;
Sci::Position position;
Sci::Position length;
Sci::Line linesAdded; /**< Negative if lines deleted. */
const char *text; /**< Only valid for changes to text, not for changes to style. */
Sci::Line line;
- int foldLevelNow;
- int foldLevelPrev;
+ Scintilla::FoldLevel foldLevelNow;
+ Scintilla::FoldLevel foldLevelPrev;
Sci::Line annotationLinesAdded;
Sci::Position token;
- DocModification(int modificationType_, Sci::Position position_=0, Sci::Position length_=0,
+ DocModification(Scintilla::ModificationFlags modificationType_, Sci::Position position_=0, Sci::Position length_=0,
Sci::Line linesAdded_=0, const char *text_=nullptr, Sci::Line line_=0) noexcept :
modificationType(modificationType_),
position(position_),
@@ -571,20 +560,20 @@ public:
linesAdded(linesAdded_),
text(text_),
line(line_),
- foldLevelNow(0),
- foldLevelPrev(0),
+ foldLevelNow(Scintilla::FoldLevel::None),
+ foldLevelPrev(Scintilla::FoldLevel::None),
annotationLinesAdded(0),
token(0) {}
- DocModification(int modificationType_, const Action &act, Sci::Line linesAdded_=0) noexcept :
+ DocModification(Scintilla::ModificationFlags modificationType_, const Action &act, Sci::Line linesAdded_=0) noexcept :
modificationType(modificationType_),
position(act.position),
length(act.lenData),
linesAdded(linesAdded_),
text(act.data.get()),
line(0),
- foldLevelNow(0),
- foldLevelPrev(0),
+ foldLevelNow(Scintilla::FoldLevel::None),
+ foldLevelPrev(Scintilla::FoldLevel::None),
annotationLinesAdded(0),
token(0) {}
};
@@ -603,7 +592,7 @@ public:
virtual void NotifyDeleted(Document *doc, void *userData) noexcept = 0;
virtual void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos) = 0;
virtual void NotifyLexerChanged(Document *doc, void *userData) = 0;
- virtual void NotifyErrorOccurred(Document *doc, void *userData, int status) = 0;
+ virtual void NotifyErrorOccurred(Document *doc, void *userData, Scintilla::Status status) = 0;
};
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 11:17:23 +0000