Add support for Dap and Illuminate, add Treesitter to main loop, fix non-treesitter...

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644 (file)
index 0000000..8ab4968
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="53a3a154-21a6-4d9c-a0fe-098517841a16" name="Default Changelist" comment="refactored code to use 16 colors only" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CodeStyleSettingsInfer">
+    <option name="done" value="true" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="KotlinMultiplatform">
+    <allAvailableExecutables />
+  </component>
+  <component name="ProjectCodeStyleSettingsMigration">
+    <option name="version" value="1" />
+  </component>
+  <component name="ProjectId" id="1tcxwMCZq9iPB29a33V3hkg9M2G" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="NEW_TOOLWINDOW_STRIPE_DEFAULTS" value="true" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="53a3a154-21a6-4d9c-a0fe-098517841a16" name="Default Changelist" comment="" />
+      <created>1623082416545</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1623082416545</updated>
+      <workItem from="1623082419439" duration="623000" />
+      <workItem from="1623083122069" duration="186000" />
+      <workItem from="1623083333705" duration="614000" />
+      <workItem from="1623085335365" duration="714000" />
+      <workItem from="1623086097206" duration="13000" />
+    </task>
+    <task id="LOCAL-00001" summary="refactored code to use 16 colors only">
+      <created>1623082924959</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1623082924959</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="refactored code to use 16 colors only" />
+    <option name="LAST_COMMIT_MESSAGE" value="refactored code to use 16 colors only" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/lua/nord/theme.lua b/lua/nord/theme.lua
index bb20277dbd34b3c619b0e82bcc6d2df5755ba5d9..35038ba5c272fa73b51c4a9208fdf4b322d241f6 100644 (file)
--- a/lua/nord/theme.lua
+++ b/lua/nord/theme.lua
@@ -394,6 +394,13 @@ theme.loadPlugins = function()
         IndentBlanklineChar =                   { fg = nord.nord3_gui },
         IndentBlanklineContextChar =            { fg = nord.nord3_gui },
 
+        -- Illuminate
+               illuminatedWord =                                               { bg = nord.highight },
+               illuminatedCurWord =                                    { bg = nord.highight },
+
+        DapBreakpoint =                         { fg = nord.nord14_gui},
+        DapStopped =                            { fg = nord.nord15_gui},
+
 
     }
     -- Options:

diff --git a/lua/nord/util.lua b/lua/nord/util.lua
index df9d74c32f59f72606c47e961f98055e57948fd9..7a28e6fec36b93692a59888b16eb43125a4e3ac3 100644 (file)
--- a/lua/nord/util.lua
+++ b/lua/nord/util.lua
@@ -42,14 +42,13 @@ function util.load()
     vim.o.termguicolors = true
     vim.g.colors_name = "nord"
 
-    -- Load plugins, treesitter and lsp async
+    -- Load plugins and lsp async
     local async
     async = vim.loop.new_async(vim.schedule_wrap(function ()
         nord.loadTerminal()
 
-        -- imort tables for plugins, treesitter and lsp
+        -- imort tables for plugins and lsp
         local plugins = nord.loadPlugins()
-        local treesitter = nord.loadTreeSitter()
         local lsp = nord.loadLSP()
 
         -- loop trough the plugins table and highlight every member
@@ -57,11 +56,6 @@ function util.load()
             util.highlight(group, colors)
         end
 
-        -- loop trough the treesitter table and highlight every member
-        for group, colors in pairs(treesitter) do
-            util.highlight(group, colors)
-        end
-
         -- loop trough the lsp table and highlight every member
         for group, colors in pairs(lsp) do
             util.highlight(group, colors)
@@ -78,6 +72,7 @@ function util.load()
     -- load the most importaint parts of the theme
     local editor = nord.loadEditor()
     local syntax = nord.loadSyntax()
+    local treesitter = nord.loadTreeSitter()
 
     -- load editor highlights
     for group, colors in pairs(editor) do
@@ -89,6 +84,11 @@ function util.load()
         util.highlight(group, colors)
     end
 
+    -- loop trough the treesitter table and highlight every member
+    for group, colors in pairs(treesitter) do
+        util.highlight(group, colors)
+    end
+
     -- load the rest later ( lsp, treesitter, plugins )
     async:send()
 end