1 files changed, 10 insertions, 2 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h b/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h
index ab95a9552c..9bbf59691c 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h
@@ -46,6 +46,9 @@ public:
     DefinitionData();
     ~DefinitionData();
 
+    DefinitionData(const DefinitionData &) = delete;
+    DefinitionData &operator=(const DefinitionData &) = delete;
+
     static DefinitionData* get(const Definition &def);
 
     bool isLoaded() const;
@@ -54,9 +57,11 @@ public:
 
     void clear();
 
-    bool load();
+    enum class OnlyKeywords : bool;
+
+    bool load(OnlyKeywords onlyKeywords = OnlyKeywords(false));
     bool loadLanguage(QXmlStreamReader &reader);
-    void loadHighlighting(QXmlStreamReader &reader);
+    void loadHighlighting(QXmlStreamReader &reader, OnlyKeywords onlyKeywords);
     void loadContexts(QXmlStreamReader &reader);
     void loadItemData(QXmlStreamReader &reader);
     void loadGeneral(QXmlStreamReader &reader);
@@ -65,6 +70,8 @@ public:
     void loadSpellchecking(QXmlStreamReader &reader);
     bool checkKateVersion(const QStringRef &verStr);
 
+    void resolveIncludeKeywords();
+
     KeywordList *keywordList(const QString &name);
     bool isWordDelimiter(QChar c) const;
 
@@ -83,6 +90,7 @@ public:
     QHash<QString, Format> formats;
     QString wordDelimiters;
     QString wordWrapDelimiters;
+    bool keywordIsLoaded = false;
     bool hasFoldingRegions = false;
     bool indentationBasedFolding = false;
     QStringList foldingIgnoreList;