[Vim Focus] Change python highlighter and each style to modify a dict of highlights instead of individual highlights

Author: TaDaa

lib/vimade/highlighter.py

@@ -287,12 +287,14 @@ def next(to_process):
 
     result = []
     attrs_eval = []
+    attrs_eval_ids = []
     base_keys = []
     for id in to_process:
       cache_key = str(id) + base_key_suffix
       if not cache_key in M.base_id_cache:
         M.base_id_cache[cache_key] = {}
         base_keys.append(cache_key)
+        attrs_eval_ids.append(id)
         attrs_eval.append(hi_string % id)
 
     if len(attrs_eval):
@@ -301,33 +303,45 @@ def next(to_process):
       # this occurs b/c another window might redo the highlight due to clear_color on the current window.
       # There is a performance gain but it's not worth maintaining the logic.
       attrs = IPC.eval_and_return('[' + ','.join(attrs_eval) + ']')
-      attrs = _process_hl_results(attrs, to_process)
+      attrs = _process_hl_results(attrs, attrs_eval_ids)
       for i, cache_key in enumerate(base_keys):
         base = M.base_id_cache.get(cache_key)
         base_hi = defaultHi(attrs[i], fg_wincolorhl)
         base['hi'] = base_hi
         base['base_key'] = str(base_hi['ctermfg']) + ',' + str(base_hi['ctermbg']) + ',' + str(base_hi['fg']) + ',' + str(base_hi['bg']) + ',' + str(base_hi['sp'])
     to_create = []
     style = win['style']
+    highlights = {}
+    hi_target = TYPE.shallow_copy(target)
+
     for id in to_process:
       base = M.base_id_cache[str(id) + base_key_suffix]
       base_hi = base['hi']
+      name = name_override if name_override else base_hi['name']
+      if name in highlights:
+        continue
       # selective copy (we cache other keys that should not be exposed)
       # copy the target for the style run
       hi_attrs = {
-          'name': name_override if name_override else base_hi['name'], # base name
+          'name': name,
           'ctermfg': base_hi['ctermfg'],
           'ctermbg': base_hi['ctermbg'],
           'fg': base_hi['fg'],
           'bg': base_hi['bg'],
           'sp': base_hi['sp'] }
-      hi_target = TYPE.shallow_copy(target)
       ### below logic prevents basebg from applying to VimadeWC (otherwise background is altered for Vim)
-      if hi_attrs['name'] == 'Normal':
+      if name == 'Normal':
         hi_attrs['ctermbg'] = None
         hi_attrs['bg'] = None
-      for s in style:
-        s.modify(hi_attrs, hi_target)
+      highlights[name] = hi_attrs
+
+    for s in style:
+      s.modify(highlights, hi_target)
+
+    for id in to_process:
+      base = M.base_id_cache[str(id) + base_key_suffix]
+      name = name_override if name_override else base['hi']['name']
+      hi_attrs = highlights[name]
       cache_key = win['hi_key'] + ':' + base['base_key'] + ':' + str(hi_attrs['ctermfg']) + ',' + str(hi_attrs['ctermbg']) + ',' + str(hi_attrs['fg']) + ',' + str(hi_attrs['bg']) + ',' + str(hi_attrs['sp'])
       vimade_hi = M.vimade_id_cache.get(cache_key)
 

lib/vimade/style/exclude.py

@@ -51,15 +51,23 @@ def before(self, win, state):
       def key(self, win, state):
         if self.condition == False:
           return ''
-        style_key = ','.join([s.key(win, state) for j, s in enumerate(self.style)])
-        if len(style_key) == 0:
+        style_keys = [s.key(win, state) for j, s in enumerate(self.style)]
+        style_key = ','.join([s for s in style_keys if s])
+        if not style_key:
           return ''
         return 'E-' + ','.join(self.exclude.values()) + '(' \
             + style_key + ')'
-      def modify(self, hl, to_hl):
-        if self.condition == False or (hl['name'] in self.exclude):
+      def modify(self, highlights, to_hl):
+        if self.condition == False:
           return
         else:
+          excluded_for_children = {}
+          for name in self.exclude:
+            if name in highlights:
+              excluded_for_children[name] = highlights[name]
+              del highlights[name]
           for s in self.style:
-            s.modify(hl, to_hl)
+            s.modify(highlights, to_hl)
+          for (name, value) in excluded_for_children.items():
+            highlights[name] = value
     self.attach = __Exclude

lib/vimade/style/fade.py

@@ -36,25 +36,26 @@ def key(self, win, state):
         if self.condition == False:
           return ''
         return 'F-' + str(self.fade)
-      def modify(self, hl, to_hl):
+      def modify(self, highlights, to_hl):
         if self.condition == False:
           return
         fade = self.fade
-        fg = hl['fg']
-        bg = hl['bg']
-        sp = hl['sp']
-        ctermfg = hl['ctermfg']
-        ctermbg = hl['ctermbg']
-        if fg != None:
-          hl['fg'] = COLOR_UTIL.interpolate24b(fg, to_hl['bg'], fade)
-        if bg != None:
-          hl['bg'] = COLOR_UTIL.interpolate24b(bg, to_hl['bg'], fade)
-        if sp != None:
-          hl['sp'] = COLOR_UTIL.interpolate24b(sp, to_hl['bg'], fade)
-        if ctermfg != None:
-          hl['ctermfg'] = COLOR_UTIL.interpolate256(ctermfg, to_hl['ctermbg'], fade)
-        if ctermbg != None:
-          hl['ctermbg'] = COLOR_UTIL.interpolate256(ctermbg, to_hl['ctermbg'], fade)
+        for hl in highlights.values():
+          fg = hl['fg']
+          bg = hl['bg']
+          sp = hl['sp']
+          ctermfg = hl['ctermfg']
+          ctermbg = hl['ctermbg']
+          if fg != None:
+            hl['fg'] = COLOR_UTIL.interpolate24b(fg, to_hl['bg'], fade)
+          if bg != None:
+            hl['bg'] = COLOR_UTIL.interpolate24b(bg, to_hl['bg'], fade)
+          if sp != None:
+            hl['sp'] = COLOR_UTIL.interpolate24b(sp, to_hl['bg'], fade)
+          if ctermfg != None:
+            hl['ctermfg'] = COLOR_UTIL.interpolate256(ctermfg, to_hl['ctermbg'], fade)
+          if ctermbg != None:
+            hl['ctermbg'] = COLOR_UTIL.interpolate256(ctermbg, to_hl['ctermbg'], fade)
         return
     parent.attach = __Fade
   def value(parent, replacement = None):

lib/vimade/style/include.py

@@ -51,16 +51,21 @@ def before(self, win, state):
       def key(self, win, state):
         if self.condition == False:
           return ''
-        style_key = ','.join([s.key(win, state) for j, s in enumerate(self.style)])
-        if len(style_key) == 0:
+        style_keys = [s.key(win, state) for j, s in enumerate(self.style)]
+        style_key = ','.join([s for s in style_keys if s])
+        if not style_key:
           return ''
         return 'I-' + ','.join(self.include.values()) + '(' \
             + style_key + ')'
-      def modify(self, hl, to_hl):
+      def modify(self, highlights, to_hl):
         if self.condition == False:
           return
-        # we don't need to foce set the bg,ctermbg here for Vim as targetting works slightly differently
-        if hl['name'] in self.include:
-          for s in self.style:
-            s.modify(hl, to_hl)
+        highlights_for_children = {}
+        for name in self.include:
+          if name in highlights:
+            highlights_for_children[name] = highlights[name]
+        for s in self.style:
+          s.modify(highlights_for_children, to_hl)
+        for (name, value) in highlights_for_children.items():
+          highlights[name] = value
     self.attach = __Include

lib/vimade/style/invert.py

@@ -46,21 +46,31 @@ def key(self, win, state):
           return ''
         # TODO shrink
         return 'INV-' + str(self.invert.get('fg',0)) + '-' + str(self.invert.get('bg',0)) + '-' + str(self.invert.get('sp',0))
-      def modify(self, hl, to_hl):
+      def modify(self, highlights, to_hl):
         if self.condition == False or not self.invert:
           return
         invert = self.invert
-        for hi in (hl, to_hl):
+        for key in ('fg', 'bg', 'sp'):
+          color = to_hl.get(key)
+          if color != None:
+            to_hl[key] = COLOR_UTIL.interpolate24b(color, 0XFFFFFF - color, 1 - invert[key])
+        for (key, i_key) in (('ctermfg', 'fg'), ('ctermbg', 'bg')):
+          color = to_hl.get(key)
+          if color != None:
+            color = COLOR_UTIL.toRgb(color, True)
+            target = [255 - color[0], 255 - color[1], 255 - color[2]]
+            to_hl[key] = COLOR_UTIL.interpolate256(color, target, 1 - invert[i_key])
+        for hl in highlights.values():
           for key in ('fg', 'bg', 'sp'):
-            color = hi.get(key)
+            color = hl.get(key)
             if color != None:
-              hi[key] = COLOR_UTIL.interpolate24b(color, 0XFFFFFF - color, 1 - invert[key])
+              hl[key] = COLOR_UTIL.interpolate24b(color, 0XFFFFFF - color, 1 - invert[key])
           for (key, i_key) in (('ctermfg', 'fg'), ('ctermbg', 'bg')):
-            color = hi.get(key)
+            color = hl.get(key)
             if color != None:
               color = COLOR_UTIL.toRgb(color, True)
               target = [255 - color[0], 255 - color[1], 255 - color[2]]
-              hi[key] = COLOR_UTIL.interpolate256(color, target, 1 - invert[i_key])
+              hl[key] = COLOR_UTIL.interpolate256(color, target, 1 - invert[i_key])
     parent.attach = __Invert
   def value(parent, replacement = None):
     if replacement != None:

lib/vimade/style/tint.py

@@ -93,7 +93,7 @@ def key(self, win, state):
         + str(to_hl['fg'] != None and (str(to_hl['fg'] or '') + ',' + (str(to_hl['ctermfg'][0])+'-'+str(to_hl['ctermfg'][1])+'-'+str(to_hl['ctermfg'][2])) + ',' + str(to_hl['fg_intensity'])) or '') + '|' \
         + (to_hl['bg'] != None and (str(to_hl['bg'] or '') + ',' + (str(to_hl['ctermbg'][0])+'-'+str(to_hl['ctermbg'][1])+'-'+str(to_hl['ctermbg'][2])) + ',' + str(to_hl['bg_intensity'])) or '') + '|'
         + (to_hl['sp'] != None and (str(to_hl['sp'] or '') + str(to_hl['sp_intensity'])) or '')
-      def modify(self, hl, target):
+      def modify(self, highlights, target):
         if self.condition == False:
           return
         to_hl = self.to_hl
@@ -103,16 +103,17 @@ def modify(self, hl, target):
           target['bg'] = COLOR_UTIL.interpolate24b(target['bg'], to_hl['bg'], to_hl['bg_intensity'])
         if target['ctermbg'] != None and to_hl['ctermbg'] != None:
           target['ctermbg'] = COLOR_UTIL.interpolate256(target['ctermbg'], to_hl['ctermbg'], to_hl['bg_intensity'])
-        if hl['fg'] != None and to_hl['fg'] !=None:
-          hl['fg'] = COLOR_UTIL.interpolate24b(hl['fg'], to_hl['fg'], to_hl['fg_intensity'])
-        if hl['bg'] != None and to_hl['bg'] != None:
-          hl['bg'] = COLOR_UTIL.interpolate24b(hl['bg'], to_hl['bg'], to_hl['bg_intensity'])
-        if hl['sp'] != None and to_hl['sp'] != None:
-          hl['sp'] = COLOR_UTIL.interpolate24b(hl['sp'], to_hl['sp'], to_hl['sp_intensity'])
-        if hl['ctermfg'] != None and to_hl['ctermfg'] != None:
-          hl['ctermfg'] = COLOR_UTIL.interpolate256(hl['ctermfg'], to_hl['ctermfg'], to_hl['fg_intensity'])
-        if hl['ctermbg'] != None and to_hl['ctermbg'] != None:
-          hl['ctermbg'] = COLOR_UTIL.interpolate256(hl['ctermbg'], to_hl['ctermbg'], to_hl['bg_intensity'])
+        for hl in highlights.values():
+          if hl['fg'] != None and to_hl['fg'] !=None:
+            hl['fg'] = COLOR_UTIL.interpolate24b(hl['fg'], to_hl['fg'], to_hl['fg_intensity'])
+          if hl['bg'] != None and to_hl['bg'] != None:
+            hl['bg'] = COLOR_UTIL.interpolate24b(hl['bg'], to_hl['bg'], to_hl['bg_intensity'])
+          if hl['sp'] != None and to_hl['sp'] != None:
+            hl['sp'] = COLOR_UTIL.interpolate24b(hl['sp'], to_hl['sp'], to_hl['sp_intensity'])
+          if hl['ctermfg'] != None and to_hl['ctermfg'] != None:
+            hl['ctermfg'] = COLOR_UTIL.interpolate256(hl['ctermfg'], to_hl['ctermfg'], to_hl['fg_intensity'])
+          if hl['ctermbg'] != None and to_hl['ctermbg'] != None:
+            hl['ctermbg'] = COLOR_UTIL.interpolate256(hl['ctermbg'], to_hl['ctermbg'], to_hl['bg_intensity'])
         return
     parent.attach = __Tint
   def value(parent, replacement = None):