From 9c751ae37053346af2f2ded990a956ef5bd15348 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 19 Sep 2013 12:30:42 +0200
Subject: [PATCH] separate highlight colour for IDs

---
 apps/opencs/model/world/scriptcontext.cpp    | 24 +++++++++++++++++++-
 apps/opencs/model/world/scriptcontext.hpp    | 13 +++++++++++
 apps/opencs/view/world/scripthighlighter.cpp | 14 ++++++++----
 apps/opencs/view/world/scripthighlighter.hpp |  5 ++--
 apps/opencs/view/world/scriptsubview.cpp     |  2 +-
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/world/scriptcontext.cpp b/apps/opencs/model/world/scriptcontext.cpp
index 69b72abf26..86689d823b 100644
--- a/apps/opencs/model/world/scriptcontext.cpp
+++ b/apps/opencs/model/world/scriptcontext.cpp
@@ -1,6 +1,14 @@
 
 #include "scriptcontext.hpp"
 
+#include <algorithm>
+
+#include <components/misc/stringops.hpp>
+
+#include "data.hpp"
+
+CSMWorld::ScriptContext::ScriptContext (const Data& data) : mData (data), mIdsUpdated (false) {}
+
 bool CSMWorld::ScriptContext::canDeclareLocals() const
 {
     return false;
@@ -18,5 +26,19 @@ char CSMWorld::ScriptContext::getMemberType (const std::string& name, const std:
 
 bool CSMWorld::ScriptContext::isId (const std::string& name) const
 {
-    return false;
+    if (!mIdsUpdated)
+    {
+        mIds = mData.getIds();
+
+        std::for_each (mIds.begin(), mIds.end(), &Misc::StringUtils::lowerCase);
+
+        mIdsUpdated = true;
+    }
+
+    return std::binary_search (mIds.begin(), mIds.end(), Misc::StringUtils::lowerCase (name));
+}
+
+void CSMWorld::ScriptContext::invalidateIds()
+{
+    mIdsUpdated = false;
 }
\ No newline at end of file
diff --git a/apps/opencs/model/world/scriptcontext.hpp b/apps/opencs/model/world/scriptcontext.hpp
index 1231aea649..b839b5a432 100644
--- a/apps/opencs/model/world/scriptcontext.hpp
+++ b/apps/opencs/model/world/scriptcontext.hpp
@@ -1,14 +1,25 @@
 #ifndef CSM_WORLD_SCRIPTCONTEXT_H
 #define CSM_WORLD_SCRIPTCONTEXT_H
 
+#include <string>
+#include <vector>
+
 #include <components/compiler/context.hpp>
 
 namespace CSMWorld
 {
+    class Data;
+
     class ScriptContext : public Compiler::Context
     {
+            const Data& mData;
+            mutable std::vector<std::string> mIds;
+            mutable bool mIdsUpdated;
+
         public:
 
+            ScriptContext (const Data& data);
+
             virtual bool canDeclareLocals() const;
             ///< Is the compiler allowed to declare local variables?
 
@@ -20,6 +31,8 @@ namespace CSMWorld
 
             virtual bool isId (const std::string& name) const;
             ///< Does \a name match an ID, that can be referenced?
+
+            void invalidateIds();
     };
 }
 
diff --git a/apps/opencs/view/world/scripthighlighter.cpp b/apps/opencs/view/world/scripthighlighter.cpp
index f06d5542e6..a16077f8aa 100644
--- a/apps/opencs/view/world/scripthighlighter.cpp
+++ b/apps/opencs/view/world/scripthighlighter.cpp
@@ -23,7 +23,7 @@ bool CSVWorld::ScriptHighlighter::parseFloat (float value, const Compiler::Token
 bool CSVWorld::ScriptHighlighter::parseName (const std::string& name, const Compiler::TokenLoc& loc,
     Compiler::Scanner& scanner)
 {
-    highlight (loc, Type_Name);
+    highlight (loc, mContext.isId (name) ? Type_Id : Type_Name);
     return true;
 }
 
@@ -63,10 +63,10 @@ void CSVWorld::ScriptHighlighter::highlight (const Compiler::TokenLoc& loc, Type
     setFormat (index, length, mScheme[type]);
 }
 
-CSVWorld::ScriptHighlighter::ScriptHighlighter (QTextDocument *parent)
-: QSyntaxHighlighter (parent), Compiler::Parser (mErrorHandler, mContext)
+CSVWorld::ScriptHighlighter::ScriptHighlighter (const CSMWorld::Data& data, QTextDocument *parent)
+: QSyntaxHighlighter (parent), Compiler::Parser (mErrorHandler, mContext), mContext (data)
 {
-    /// \ŧodo replace this with user settings
+    /// \todo replace this with user settings
     {
         QTextCharFormat format;
         format.setForeground (Qt::darkMagenta);
@@ -103,6 +103,12 @@ CSVWorld::ScriptHighlighter::ScriptHighlighter (QTextDocument *parent)
         mScheme.insert (std::make_pair (Type_Comment, format));
     }
 
+    {
+        QTextCharFormat format;
+        format.setForeground (Qt::blue);
+        mScheme.insert (std::make_pair (Type_Id, format));
+    }
+
     // configure compiler
     Compiler::registerExtensions (mExtensions);
     mContext.setExtensions (&mExtensions);
diff --git a/apps/opencs/view/world/scripthighlighter.hpp b/apps/opencs/view/world/scripthighlighter.hpp
index 406935b8d0..e29a664903 100644
--- a/apps/opencs/view/world/scripthighlighter.hpp
+++ b/apps/opencs/view/world/scripthighlighter.hpp
@@ -24,7 +24,8 @@ namespace CSVWorld
                 Type_Name,
                 Type_Keyword,
                 Type_Special,
-                Type_Comment
+                Type_Comment,
+                Type_Id
             };
 
         private:
@@ -73,7 +74,7 @@ namespace CSVWorld
 
         public:
 
-            ScriptHighlighter (QTextDocument *parent);
+            ScriptHighlighter (const CSMWorld::Data& data, QTextDocument *parent);
 
             virtual void highlightBlock (const QString& text);
     };
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index ab1c2d57c6..6a7ec752f9 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -58,7 +58,7 @@ CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc:
     connect (mModel, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
         this, SLOT (rowsAboutToBeRemoved (const QModelIndex&, int, int)));
 
-    new ScriptHighlighter (mEditor->document());
+    new ScriptHighlighter (document.getData(), mEditor->document());
 }
 
 void CSVWorld::ScriptSubView::setEditLock (bool locked)