Made words completer run async on load and update; swapped out tabs to use Gtk.Notebook

plugins/completers/example_completer/manifest.json

@@ -0,0 +1,7 @@
+{
+    "name": "Example Completer",
+    "author": "John Doe",
+    "version": "0.0.1",
+    "support": "",
+    "requests": {}
+}

plugins/completers/example_completer/plugin.py

@@ -0,0 +1,40 @@
+# Python imports
+
+# Lib imports
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk
+
+# Application imports
+from libs.dto.base_event import BaseEvent
+from libs.event_factory import Event_Factory
+
+from plugins.plugin_types import PluginCode
+
+from .provider import Provider
+
+
+
+class Plugin(PluginCode):
+    def __init__(self):
+        super(Plugin, self).__init__()
+
+        self.provider: Provider = None
+
+
+    def _controller_message(self, event: BaseEvent):
+        ...
+
+    def load(self):
+        self.provider = Provider()
+
+        event = Event_Factory.create_event(
+            "register_provider",
+            provider_name = "Example Completer",
+            provider      = self.provider,
+            language_ids  = []
+        )
+        self.message_to("completion", event)
+
+    def run(self):
+        ...

plugins/completers/example_completer/provider.py

@@ -0,0 +1,76 @@
+# Python imports
+
+# Lib imports
+import gi
+gi.require_version('GtkSource', '4')
+
+from gi.repository import GObject
+from gi.repository import GtkSource
+
+# Application imports
+from .provider_response_cache import ProviderResponseCache
+
+
+
+class Provider(GObject.GObject, GtkSource.CompletionProvider):
+    """
+        This is a custom Completion Example Provider.
+        # NOTE: used information from here --> https://warroom.rsmus.com/do-that-auto-complete/
+    """
+    __gtype_name__ = 'ExampleCompletionProvider'
+
+    def __init__(self):
+        super(Provider, self).__init__()
+
+        self.response_cache: ProviderResponseCache = ProviderResponseCache()
+
+
+    def do_get_name(self):
+        """ Returns: a new string containing the name of the provider. """
+        return 'Example Code Completion'
+
+    def do_match(self, context):
+        # word = context.get_word()
+        # if not word or len(word) < 2: return False
+
+        """ Get whether the provider match the context of completion detailed in context. """
+        word = self.response_cache.get_word(context)
+        if not word or len(word) < 2: return False
+
+        return True
+
+    def do_get_priority(self):
+        """ Determin position in result list along other providor results. """
+        return 5
+
+    def do_activate_proposal(self, proposal, iter_):
+        """ Manually handle actual completion insert or set flags and handle normally. """
+
+        buffer = iter_.get_buffer()
+        # Note: Flag mostly intended for SourceViewsMultiInsertState
+        #       to insure marker processes inserted text correctly.
+        buffer.is_processing_completion = True
+        return False
+
+    def do_get_activation(self):
+        """ The context for when a provider will show results """
+    #     return GtkSource.CompletionActivation.NONE
+    #     return GtkSource.CompletionActivation.USER_REQUESTED
+    #     return GtkSource.CompletionActivation.USER_REQUESTED | GtkSource.CompletionActivation.INTERACTIVE
+        return GtkSource.CompletionActivation.INTERACTIVE
+
+    def do_populate(self, context):
+        results   = self.response_cache.filter_with_context(context)
+        proposals = []
+
+        for entry in results:
+            proposals.append(
+                self.response_cache.create_completion_item(
+                    entry["label"],
+                    entry["text"],
+                    entry["info"]
+                )
+            )
+
+        context.add_proposals(self, proposals, True)
+

plugins/completers/example_completer/provider_response_cache.py

@@ -0,0 +1,109 @@
+# Python imports
+import re
+
+# Lib imports
+import gi
+gi.require_version('Gtk', '3.0')
+gi.require_version('GtkSource', '4')
+
+from gi.repository import Gtk
+from gi.repository import GLib
+from gi.repository import GtkSource
+
+# Application imports
+from libs.event_factory import Code_Event_Types
+
+from core.widgets.code.completion_providers.provider_response_cache_base import ProviderResponseCacheBase
+
+
+
+class ProviderResponseCache(ProviderResponseCacheBase):
+    def __init__(self):
+        super(ProviderResponseCache, self).__init__()
+
+        self.matchers: dict = {
+            "hello": {
+                "label": "Hello, World!",
+                "text": "Hello, World!",
+                "info": GLib.markup_escape_text( "<b>Says the first ever program developers write...</b>" )
+            },
+            "foo": {
+                "label": "foo",
+                "text": "foo }}"
+            },
+            "bar": {
+                "label": "bar",
+                "text": "bar }}"
+            }
+        }
+
+
+    def process_file_load(self, event: Code_Event_Types.AddedNewFileEvent):
+        ...
+
+    def process_file_close(self, event: Code_Event_Types.RemovedFileEvent):
+        ...
+
+    def process_file_save(self, event: Code_Event_Types.SavedFileEvent):
+        ...
+
+    def process_file_change(self, event: Code_Event_Types.TextChangedEvent):
+        ...
+
+    def filter(self, word: str) -> list[dict]:
+        ...
+
+    def filter_with_context(self, context) -> list[dict]:
+        """
+            In this instance, it will do 2 things:
+                1) always provide Hello World! (Not ideal but an option so its in the example)
+                2) Utilizes the Gtk.TextIter from the TextBuffer to determine if there is a jinja
+                    example of '{{ custom.' if so it will provide you with the options of foo and bar.
+            If selected it will insert foo }} or bar }}, completing your syntax...
+
+            PLEASE NOTE the GtkTextIter Logic and regex are really rough and should be adjusted and tuned
+        """
+
+        proposals: list[dict] = [
+            {
+                "label": self.matchers[ "hello" ]["label"],
+                "text":  self.matchers[ "hello" ]["text"],
+                "info":  self.matchers[ "hello" ]["info"]
+            }
+        ]
+
+        # Gtk Versions differ on get_iter responses...
+        end_iter = context.get_iter()
+        if not isinstance(end_iter, Gtk.TextIter):
+            _, end_iter = context.get_iter()
+
+        if not end_iter: return
+
+        buf = end_iter.get_buffer()
+        mov_iter = end_iter.copy()
+        if mov_iter.backward_search('{{', Gtk.TextSearchFlags.VISIBLE_ONLY):
+            mov_iter, _ = mov_iter.backward_search('{{', Gtk.TextSearchFlags.VISIBLE_ONLY)
+            left_text = buf.get_text(mov_iter, end_iter, True)
+        else:
+            left_text = ''
+
+        if re.match(r'.*\{\{\s*custom\.$', left_text):
+            # optionally proposed based on left search via regex
+            proposals.append(
+                {
+                    "label": self.matchers[ "foo" ]["label"],
+                    "text":  self.matchers[ "foo" ]["text"],
+                    "info":  ""
+                }
+            )
+
+            # optionally proposed based on left search via regex
+            proposals.append(
+                {
+                    "label": self.matchers[ "bar" ]["label"],
+                    "text":  self.matchers[ "bar" ]["text"],
+                    "info":  ""
+                }
+            )
+
+        return proposals

plugins/completers/lsp_completer/provider.py

@@ -4,15 +4,15 @@
 import gi
 gi.require_version('GtkSource', '4')
 
-from gi.repository import GtkSource
 from gi.repository import GObject
+from gi.repository import GtkSource
 
 # Application imports
 from .provider_response_cache import ProviderResponseCache
 
 
 
-class Provider(GObject.Object, GtkSource.CompletionProvider):
+class Provider(GObject.GObject, GtkSource.CompletionProvider):
     """
         This code is an LSP code completion plugin for Newton.
         # NOTE: Some code pulled/referenced from here --> https://github.com/isamert/gedi
@@ -20,7 +20,7 @@ class Provider(GObject.Object, GtkSource.CompletionProvider):
     __gtype_name__ = 'LSPProvider'
 
     def __init__(self):
-        GObject.Object.__init__(self)
+        super(Provider, self).__init__()
 
         self.response_cache: ProviderResponseCache = ProviderResponseCache()
 
@@ -31,14 +31,11 @@ class Provider(GObject.Object, GtkSource.CompletionProvider):
     def do_get_name(self):
         return "LSP Code Completion"
 
-    def get_iter_correctly(self, context):
-        return context.get_iter()[1] if isinstance(context.get_iter(), tuple) else context.get_iter()
-
     def do_match(self, context):
         word = self.response_cache.get_word(context)
         if not word or len(word) < 2: return False
 
-        iter = self.get_iter_correctly(context)
+        iter = self.response_cache.get_iter_correctly(context)
         iter.backward_char()
         ch = iter.get_char()
         # NOTE: Look to re-add or apply supprting logic to use spaces
@@ -56,6 +53,13 @@ class Provider(GObject.Object, GtkSource.CompletionProvider):
     def do_get_priority(self):
         return 5
 
+    def do_activate_proposal(self, proposal, iter_):
+        buffer = iter_.get_buffer()
+        # Note: Flag mostly intended for SourceViewsMultiInsertState
+        #       to insure marker processes inserted text correctly.
+        buffer.is_processing_completion = True
+        return False
+
     def do_get_activation(self):
         """ The context for when a provider will show results """
     #     return GtkSource.CompletionActivation.NONE
@@ -63,17 +67,16 @@ class Provider(GObject.Object, GtkSource.CompletionProvider):
     #     return GtkSource.CompletionActivation.INTERACTIVE
 
     def do_populate(self, context):
-        proposals = self.get_completion_filter(context)
+        results   = self.response_cache.filter_with_context(context)
+        proposals = []
+
+        for entry in results:
+            proposals.append(
+                self.response_cache.create_completion_item(
+                    entry["label"],
+                    entry["text"],
+                    entry["info"]
+                )
+            )
 
         context.add_proposals(self, proposals, True)
-
-    def get_completion_filter(self, context):
-        proposals = [
-            self.response_cache.create_completion_item(
-                "LSP Class",
-                "LSP Code",
-                "A test LSP completion item..."
-            )
-        ]
-
-        return proposals

plugins/completers/lsp_completer/provider_response_cache.py

@@ -30,16 +30,16 @@ class ProviderResponseCache(ProviderResponseCacheBase):
     def process_file_change(self, event: Code_Event_Types.TextChangedEvent):
         ...
 
-    def filter(self, word: str):
-        ...
+    def filter(self, word: str) -> list[dict]:
+        return []
 
-    def filter_with_context(self, context: GtkSource.CompletionContext):
+    def filter_with_context(self, context: GtkSource.CompletionContext)  -> list[dict]:
         proposals = [
-            self.create_completion_item(
-                "LSP Class",
-                "LSP Code",
-                "A test LSP completion item..."
-            )
+            {
+                "label": "LSP Class",
+                "text": "LSP Code",
+                "info": "A test LSP completion item..."
+            }
         ]
 
-        return proposals        
+        return proposals

plugins/completers/snippets_completer/__init__.py

@@ -0,0 +1,3 @@
+"""
+    Pligin Module
+"""

plugins/completers/snippets_completer/__main__.py

@@ -0,0 +1,3 @@
+"""
+    Pligin Package
+"""

plugins/completers/snippets_completer/provider.py

@@ -3,11 +3,9 @@ import re
 
 # Lib imports
 import gi
-gi.require_version('Gtk', '3.0')
 gi.require_version('GtkSource', '4')
 
 from gi.repository import GObject
-from gi.repository import Gtk
 from gi.repository import GtkSource
 
 # Application imports
@@ -23,7 +21,7 @@ class Provider(GObject.GObject, GtkSource.CompletionProvider):
     __gtype_name__ = 'SnippetsCompletionProvider'
 
     def __init__(self):
-        GObject.Object.__init__(self)
+        super(Provider, self).__init__()
 
         self.response_cache: ProviderResponseCache = ProviderResponseCache()
 
@@ -40,6 +38,13 @@ class Provider(GObject.GObject, GtkSource.CompletionProvider):
     def do_get_priority(self):
         return 2
 
+    def do_activate_proposal(self, proposal, iter_):
+        buffer = iter_.get_buffer()
+        # Note: Flag mostly intended for SourceViewsMultiInsertState
+        #       to insure marker processes inserted text correctly.
+        buffer.is_processing_completion = True
+        return False
+
     def do_get_activation(self):
         """ The context for when a provider will show results """
         # return GtkSource.CompletionActivation.NONE

plugins/completers/snippets_completer/provider_response_cache.py

@@ -52,8 +52,8 @@ class ProviderResponseCache(ProviderResponseCacheBase):
     def process_file_change(self, event: Code_Event_Types.TextChangedEvent):
         ...
 
-    def filter(self, word: str):
-        response: list = []
+    def filter(self, word: str) -> list[dict]:
+        response: list[dict] = []
 
         for entry in self.matchers:
             if not word in entry: continue
@@ -61,3 +61,8 @@ class ProviderResponseCache(ProviderResponseCacheBase):
             response.append(data)
 
         return response
+
+    def filter_with_context(self, context: GtkSource.CompletionContext) -> list[dict]:
+        response: list[dict] = []
+
+        return response

plugins/completers/words_completer/__init__.py

@@ -0,0 +1,3 @@
+"""
+    Pligin Module
+"""

plugins/completers/words_completer/__main__.py

@@ -0,0 +1,3 @@
+"""
+    Pligin Package
+"""

plugins/completers/words_completer/alt_provider.py

@@ -0,0 +1,53 @@
+# Python imports
+import re
+
+# Lib imports
+import gi
+gi.require_version('Gtk', '3.0')
+gi.require_version('GtkSource', '4')
+
+from gi.repository import GObject
+from gi.repository import Gtk
+from gi.repository import GtkSource
+
+# Application imports
+from .provider_response_cache import ProviderResponseCache
+
+
+
+class Provider(GtkSource.CompletionWords):
+    """
+        This is a Words Completion Provider.
+        # NOTE: used information from here --> https://warroom.rsmus.com/do-that-auto-complete/
+    """
+    __gtype_name__ = 'WordsCompletionProvider'
+
+    def __init__(self):
+        super(Provider, self).__init__()
+
+        self.response_cache: ProviderResponseCache = ProviderResponseCache()
+
+
+    def do_get_name(self):
+        return 'Words Completion'
+
+    def do_match(self, context):
+        word = self.response_cache.get_word(context)
+        if not word or len(word) < 2: return False
+        return True
+
+    def do_get_priority(self):
+        return 0
+
+    def do_activate_proposal(self, proposal, iter_):
+        buffer = iter_.get_buffer()
+        # Note: Flag mostly intended for SourceViewsMultiInsertState
+        #       to insure marker processes inserted text correctly.
+        buffer.is_processing_completion = True
+        return False
+
+    def do_get_activation(self):
+        """ The context for when a provider will show results """
+        # return GtkSource.CompletionActivation.NONE
+        # return GtkSource.CompletionActivation.USER_REQUESTED
+        return GtkSource.CompletionActivation.INTERACTIVE

plugins/completers/words_completer/manifest.json

@@ -0,0 +1,7 @@
+{
+    "name": "Words Completer",
+    "author": "ITDominator",
+    "version": "0.0.1",
+    "support": "",
+    "requests": {}
+}

plugins/completers/words_completer/plugin.py

@@ -0,0 +1,40 @@
+# Python imports
+
+# Lib imports
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk
+
+# Application imports
+from libs.dto.base_event import BaseEvent
+from libs.event_factory import Event_Factory
+
+from plugins.plugin_types import PluginCode
+
+from .provider import Provider
+
+
+
+class Plugin(PluginCode):
+    def __init__(self):
+        super(Plugin, self).__init__()
+
+        self.provider: Provider = None
+
+
+    def _controller_message(self, event: BaseEvent):
+        ...
+
+    def load(self):
+        self.provider = Provider()
+
+        event = Event_Factory.create_event(
+            "register_provider",
+            provider_name = "Words Completer",
+            provider      = self.provider,
+            language_ids  = []
+        )
+        self.message_to("completion", event)
+
+    def run(self):
+        ...

plugins/completers/words_completer/provider.py

@@ -0,0 +1,71 @@
+# Python imports
+import re
+
+# Lib imports
+import gi
+gi.require_version('GtkSource', '4')
+
+from gi.repository import GObject
+from gi.repository import GtkSource
+
+# Application imports
+from .provider_response_cache import ProviderResponseCache
+
+
+
+class Provider(GObject.GObject, GtkSource.CompletionProvider):
+    """
+        This is a Words Completion Provider.
+        # NOTE: used information from here --> https://warroom.rsmus.com/do-that-auto-complete/
+    """
+    # __gtype_name__ = 'WordsCompletionProvider'
+
+    def __init__(self):
+        super(Provider, self).__init__()
+
+        self.response_cache: ProviderResponseCache = ProviderResponseCache()
+
+
+    def do_get_name(self):
+        return 'Words Completion'
+
+    def do_match(self, context):
+        word = self.response_cache.get_word(context)
+        if not word or len(word) < 2: return False
+        return True
+
+    def do_get_priority(self):
+        return 0
+
+    def do_activate_proposal(self, proposal, iter_):
+        buffer = iter_.get_buffer()
+        # Note: Flag mostly intended for SourceViewsMultiInsertState
+        #       to insure marker processes inserted text correctly.
+        buffer.is_processing_completion = True
+        return False
+
+    def do_get_activation(self):
+        """ The context for when a provider will show results """
+        # return GtkSource.CompletionActivation.NONE
+        # return GtkSource.CompletionActivation.USER_REQUESTED
+        return GtkSource.CompletionActivation.INTERACTIVE
+
+    def do_populate(self, context):
+        word    = self.response_cache.get_word(context)
+        results = self.response_cache.filter_with_context(context)
+        # results = self.response_cache.filter(word)
+
+        # if not results:
+        #     results = self.response_cache.filter_with_context(context)
+
+        proposals = []
+        for entry in results:
+            proposals.append(
+                self.response_cache.create_completion_item(
+                    entry["label"],
+                    entry["text"],
+                    entry["info"]
+                )
+            )
+
+        context.add_proposals(self, proposals, True)

plugins/completers/words_completer/provider_response_cache.py

@@ -0,0 +1,117 @@
+# Python imports
+import asyncio
+
+# Lib imports
+import gi
+gi.require_version('GtkSource', '4')
+
+from gi.repository import GLib
+from gi.repository import GtkSource
+
+# Application imports
+from libs.event_factory import Code_Event_Types
+
+from core.widgets.code.completion_providers.provider_response_cache_base import ProviderResponseCacheBase
+
+
+
+class ProviderResponseCache(ProviderResponseCacheBase):
+    def __init__(self):
+        super(ProviderResponseCache, self).__init__()
+
+        self.matchers: dict = {}
+
+
+    def process_file_load(self, event: Code_Event_Types.AddedNewFileEvent):
+        buffer = event.file.buffer
+        asyncio.run( self._handle_change(buffer) )
+
+    def process_file_close(self, event: Code_Event_Types.RemovedFileEvent):
+        self.matchers[event.file.buffer] = set()
+        del self.matchers[event.file.buffer]
+
+    def process_file_save(self, event: Code_Event_Types.SavedFileEvent):
+        ...
+
+    def process_file_change(self, event: Code_Event_Types.TextChangedEvent):
+        buffer = event.file.buffer
+        asyncio.run( self._handle_change(buffer) )
+
+    async def _handle_change(self, buffer):
+        start_itr = buffer.get_start_iter()
+        end_itr   = buffer.get_end_iter()
+        data      = buffer.get_text(start_itr, end_itr, False)
+
+        if not data:
+            GLib.idle_add(self.load_empty_set, buffer)
+            return
+
+        if not buffer in self.matchers:
+            GLib.idle_add(self.load_as_new_set, buffer, data)
+            return
+
+        new_words = self.get_all_words(data)
+        GLib.idle_add(self.load_into_set, buffer, new_words)
+
+    def filter(self, word: str) -> list[dict]:
+        response: list[dict] = []
+
+        for entry in self.matchers:
+            if not word in entry: continue
+            data = self.matchers[entry]
+            response.append(data)
+
+        return response
+
+    def filter_with_context(self, context: GtkSource.CompletionContext) -> list[dict]:
+        buffer = self.get_iter_correctly(context).get_buffer()
+        word   = self.get_word(context).rstrip()
+
+        response: list[dict] = []
+        for entry in self.matchers[buffer]:
+            if not entry.rstrip().startswith(word): continue
+
+            data = {
+                "label": entry,
+                "text": entry,
+                "info": ""
+            }
+
+            response.append(data)
+
+        return response
+
+
+    def load_empty_set(self, buffer):
+        self.matchers[buffer] = set()
+
+    def load_into_set(self, buffer, new_words):
+        self.matchers[buffer].update(new_words)
+
+    def load_as_new_set(self, buffer, data):
+        self.matchers[buffer] = self.get_all_words(data)
+
+    def get_all_words(self, data: str):
+        words = set()
+
+        def is_word_char(c):
+            return c.isalnum() or c == '_'
+
+        size = len(data)
+        i = 0
+        
+        while i < size:
+            # Skip non-word characters
+            while i < size and not is_word_char(data[i]):
+                i += 1
+
+            start = i
+            # Consume word characters
+            while i < size and is_word_char(data[i]):
+                i += 1
+
+            word = data[start:i]
+            if not word: continue
+            words.add(word)
+
+        return words

src/core/widgets/code/completion_providers/provider_response_cache_base.py

@@ -38,20 +38,20 @@ class ProviderResponseCacheBase:
     def process_file_change(self, buffer: GtkSource.Buffer):
         raise ProviderResponseCacheException("ProviderResponseCacheBase 'process_change' not implemented...")
 
-    def filter(self, word: str):
+    def filter(self, word: str) -> list[dict]:
         raise ProviderResponseCacheException("ProviderResponseCacheBase 'filter' not implemented...")
 
-    def filter_with_context(self, context: GtkSource.CompletionContext):
+    def filter_with_context(self, context: GtkSource.CompletionContext) -> list[dict]:
         raise ProviderResponseCacheException("ProviderResponseCacheBase 'filter_with_context' not implemented...")
 
 
     def create_completion_item(
         self,
-        label: str      = "",
-        text: str       = "",
-        info: str       = "",
-        completion: any = None
-    ):
+        label: str = "",
+        text: str  = "",
+        info: str  = "",
+        icon: any  = None
+    ) -> dict:
         if not label or not text: return
 
         comp_item = GtkSource.CompletionItem.new()
@@ -62,26 +62,58 @@ class ProviderResponseCacheBase:
             comp_item.set_info(info)
             # comp_item.set_markup(f"<h3>{info}</h3>")
 
-        if completion:
+        if icon:
             comp_item.set_icon(
-                self.get_icon_for_type(completion.type)
+                self.get_icon_for_type(icon.type)
             )
 
         return comp_item
 
-    def get_word(self, context):
-        start_iter = context.get_iter()
-        end_iter   = None
+    def get_all_marks(self, buffer) -> list:
+        marks: list = []
+        iter_ = buffer.get_start_iter()
 
-        if not isinstance(start_iter, Gtk.TextIter):
-            _, start_iter = context.get_iter()
-            end_iter = start_iter.copy()
+        while iter_:
+            marks = iter_.get_marks()
+
+            for mark in marks:
+                if mark and mark not in marks:
+                    marks.append(mark)
+
+            if not iter_.forward_char():
+                break
+
+        return marks
+
+    def get_all_insert_marks(self, buffer) -> list:
+        marks: list = []
+        iter_ = buffer.get_start_iter()
+
+        while iter_:
+            marks = iter_.get_marks()
+
+            for mark in marks:
+                if mark.get_name() and "multi_insert_" in mark.get_name():
+                    marks.append(mark)
+
+            if not iter_.forward_char():
+                break
+
+        return marks
+
+    def get_word(self, context) -> str:
+        start_iter = self.get_iter_correctly(context)
+        end_iter   = start_iter.copy()
 
         if not start_iter.starts_word():
             start_iter.backward_word_start()
 
-        end_iter.forward_word_end()
+        if not end_iter.ends_word():
+            end_iter.forward_word_end()
 
         buffer = start_iter.get_buffer()
 
         return buffer.get_text(start_iter, end_iter, False)
+
+    def get_iter_correctly(self, context) -> Gtk.TextIter:
+        return context.get_iter()[1] if isinstance(context.get_iter(), tuple) else context.get_iter()

src/core/widgets/code/controllers/completion_controller.py

@@ -17,9 +17,6 @@ class CompletionController(ControllerBase):
     def __init__(self):
         super(CompletionController, self).__init__()
 
-        self.words_provider = GtkSource.CompletionWords.new("words", None)
-        self.words_provider.props.activation = GtkSource.CompletionActivation.INTERACTIVE
-
         self._completers: list[GtkSource.Completion]             = []
         self._providers: dict[str, GtkSource.CompletionProvider] = {}
 
@@ -45,10 +42,12 @@ class CompletionController(ControllerBase):
     def register_completer(self, completer: GtkSource.Completion):
         self._completers.append(completer)
 
-        completer.add_provider(self.words_provider)
         for provider in self._providers.values():
             completer.add_provider(provider)
 
+    def unregister_completer(self, completer: GtkSource.Completion):
+        self._completers.remove(completer)
+
     def register_provider(
         self,
         provider_name: str,
@@ -68,14 +67,10 @@ class CompletionController(ControllerBase):
             completer.remove_provider(provider)
 
     def provider_process_file_load(self, event: Code_Event_Types.AddedNewFileEvent):
-        self.words_provider.register(event.file.buffer)
-
         for provider in self._providers.values():
             provider.response_cache.process_file_load(event)
 
     def provider_process_file_close(self, event: Code_Event_Types.RemovedFileEvent):
-        self.words_provider.unregister(event.file.buffer)
-
         for provider in self._providers.values():
             provider.response_cache.process_file_close(event)
 

src/core/widgets/code/controllers/tabs_controller.py

@@ -1,6 +1,9 @@
 # Python imports
 
 # Lib imports
+import gi
+
+from gi.repository import Gtk
 
 # Application imports
 from libs.controllers.controller_base import ControllerBase
@@ -19,11 +22,15 @@ class TabsController(ControllerBase):
 
         self.active_view: SourceView = None
         self.tabs_widget: TabsWidget = TabsWidget()
+        self.tabs_widget.message     = self.message
 
 
     def _controller_message(self, event: Code_Event_Types.CodeEvent):
         if isinstance(event, Code_Event_Types.FocusedViewEvent):
             self.active_view = event.view
+            self.tabs_widget.view_changed(
+                event.view.get_buffer()
+            )
         elif isinstance(event, Code_Event_Types.FilePathSetEvent):
             self.update_tab_label(event)
         elif isinstance(event, Code_Event_Types.AddedNewFileEvent):
@@ -37,48 +44,32 @@ class TabsController(ControllerBase):
         return self.tabs_widget
 
     def update_tab_label(self, event: Code_Event_Types.FilePathSetEvent):
-        for tab in self.tabs_widget.get_children():
+        for page_widget in self.tabs_widget.get_children():
+            tab = self.tabs_widget.get_tab_label(page_widget)
             if not event.file == tab.file: continue
+
             tab.label.set_label(event.file.fname)
+
             break
 
     def add_tab(self, event: Code_Event_Types.AddedNewFileEvent):
-        def set_active_tab(tab, eve, file):
-            event = Event_Factory.create_event(
-                "set_active_file",
-                buffer = tab.get_parent().file.buffer
-            )
-
-            self.active_view.set_buffer(
-                tab.get_parent().file.buffer
-            )
-
-            self.message(event)
-
-        def close_tab(tab, eve, file):
-            event = Event_Factory.create_event(
-                "remove_file",
-                buffer = tab.get_parent().file.buffer
-            )
-
-            self.message(event)
-
+        box = Gtk.Separator()
         tab = TabWidget()
+
         tab.file = event.file
         tab.label.set_label(event.file.fname)
-        tab.set_select_signal(set_active_tab)
-        tab.set_close_signal(close_tab)
 
-        self.tabs_widget.add(tab)
-        tab.show()
+        self.tabs_widget.append_page(box, tab)
+        tab.show_all()
 
     def remove_tab(self, event: Code_Event_Types.RemovedFileEvent):
-        for tab in self.tabs_widget.get_children():
+        for page_widget in self.tabs_widget.get_children():
+            tab = self.tabs_widget.get_tab_label(page_widget)
             if not event.file == tab.file: continue
 
             tab.clear_signals_and_data()
-            tab.run_dispose()
-            tab.destroy()
+            self.tabs_widget.remove_page(
+                self.tabs_widget.page_num(page_widget)
+            )
 
-            del tab
             break

src/core/widgets/code/controllers/views/source_views_controller.py

@@ -33,8 +33,10 @@ class SourceViewsController(ControllerBase, list):
         if isinstance(event, Code_Event_Types.TextChangedEvent):
             if not self.signal_mapper.active_view: return
             self.signal_mapper.active_view.command.exec("update_info_bar")
-        elif isinstance(event, Code_Event_Types.TextChangedEvent):
-            self.signal_mapper.active_view.command.exec("update_info_bar")
+        elif isinstance(event, Code_Event_Types.SetActiveFileEvent):
+            self.signal_mapper.active_view.set_buffer(
+                event.buffer
+            )
         elif isinstance(event, Code_Event_Types.TextInsertedEvent):
             self.signal_mapper.insert_text(event.file, event.text)
 

src/core/widgets/code/controllers/views/states/source_view_multi_insert_state.py

@@ -34,6 +34,9 @@ class SourceViewsMultiInsertState(MarkEventsMixin):
         if not self.insert_markers: return False
 
         buffer = file.buffer
+        if buffer.is_processing_completion:
+            self.insert_completion_text(buffer, text)
+            return True
 
         # freeze buffer and insert to each mark (if any)
         buffer.block_insert_after_signal()
@@ -49,6 +52,32 @@ class SourceViewsMultiInsertState(MarkEventsMixin):
 
         return True
 
+    def insert_completion_text(self, buffer, text):
+        buffer.is_processing_completion = False
+
+        # freeze buffer and insert to each mark (if any)
+        buffer.block_insert_after_signal()
+        buffer.begin_user_action()
+
+        with buffer.freeze_notify(): 
+            for mark in self.insert_markers:
+                end_itr = buffer.get_iter_at_mark(mark)
+                start_itr = end_itr.copy()
+
+                if not start_itr.starts_word():
+                    start_itr.backward_word_start()
+
+                if not end_itr.ends_word():
+                    end_itr.forward_word_end()
+
+                buffer.delete(start_itr, end_itr)
+                buffer.insert(end_itr, text, -1)
+
+        buffer.end_user_action()
+        buffer.unblock_insert_after_signal()
+
+        return True
+
     def move_cursor(self, source_view, step, count, extend_selection, emit):
         buffer = source_view.get_buffer()
 
@@ -95,7 +124,7 @@ class SourceViewsMultiInsertState(MarkEventsMixin):
             return False
 
         is_future = key_mapper._key_release_event(eve)
-        if is_future: return False
+        if is_future: return True
 
         command = key_mapper._key_press_event(eve)
         if not command: return False
@@ -108,7 +137,7 @@ class SourceViewsMultiInsertState(MarkEventsMixin):
         command = key_mapper._key_release_event(eve)
         is_past = key_mapper._key_press_event(eve)
 
-        if is_past: return False
+        if is_past: return True
         if not command: return False
 
         source_view.command.exec(command)

src/core/widgets/code/source_buffer.py

@@ -13,6 +13,8 @@ class SourceBuffer(GtkSource.Buffer):
     def __init__(self):
         super(SourceBuffer, self).__init__()
 
+        self.is_processing_completion: bool = False
+
         self._handler_ids = []
 
 

src/core/widgets/code/tab_widget.py

@@ -10,52 +10,62 @@ from gi.repository import Gtk
 
 
 class TabWidget(Gtk.Box):
+    """docstring for TabWidget"""
+
     def __init__(self):
         super(TabWidget, self).__init__()
 
-        self.file = None
+        self._close_tab = None
 
         self._setup_styling()
         self._setup_signals()
-        self._subscribe_to_events()
         self._load_widgets()
 
-        self.show_all()
-
 
     def _setup_styling(self):
         ctx = self.get_style_context()
         ctx.add_class("tab-widget")
 
+        self.set_orientation(0)
+        self.set_hexpand(False)
+
     def _setup_signals(self):
         ...
 
-    def _subscribe_to_events(self):
-        ...
-
     def _load_widgets(self):
-        self._label_eve_box = Gtk.EventBox()
-        self.label          = Gtk.Label(label = "")
-        self.close_btn      = Gtk.Button(label = "X")
+        self.label     = Gtk.Label()
+        self.close_btn = Gtk.Button()
+        icon           = Gtk.Image(stock = Gtk.STOCK_CLOSE)
 
         ctx = self.label.get_style_context()
         ctx.add_class("tab-label")
         ctx = self.close_btn.get_style_context()
         ctx.add_class("tab-close-bttn")
 
+        self.label.set_xalign(0.0)
+        self.label.set_margin_left(25)
+        self.label.set_margin_right(25)
         self.label.set_hexpand(True)
 
-        self._label_eve_box.add(self.label)
-        self.add(self._label_eve_box)
+        self.close_btn.add(icon)
+        self.add(self.label)
         self.add(self.close_btn)
 
-    def clear_signals_and_data(self):
-        del self.file
-        self._label_eve_box.disconnect(self._label_eve_box_id)
-        self.close_btn.disconnect(self.close_btn_id)
+        self.show_all()
 
-    def set_select_signal(self, callback):
-        self._label_eve_box_id = self._label_eve_box.connect('button-release-event', callback, self.file)
+    def clear_signals_and_data(self):
+        self.close_btn.disconnect(self._handler_id)
+        self._close_tab    = None
+        self._handler_id   = None
+
+        for child in self.get_children():
+            child.unparent()
+            child.run_dispose()
+            child.destroy()
 
     def set_close_signal(self, callback):
-        self.close_btn_id = self.close_btn.connect('button-release-event', callback, self.file)
+        self._handler_id = self.close_btn.connect(
+            'button-release-event',
+            callback,
+            self.file
+        )

src/core/widgets/code/tabs_widget.py

@@ -6,16 +6,13 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
-from libs.event_factory import Code_Event_Types
-
-from .source_view import SourceView
-from .source_file import SourceFile
+from libs.event_factory import Event_Factory, Code_Event_Types
 
 from .tab_widget import TabWidget
 
 
 
-class TabsWidget(Gtk.ButtonBox):
+class TabsWidget(Gtk.Notebook):
     def __init__(self):
         super(TabsWidget, self).__init__()
 
@@ -26,10 +23,12 @@ class TabsWidget(Gtk.ButtonBox):
 
 
     def _setup_styling(self):
-        self.set_layout(Gtk.ButtonBoxStyle.CENTER)
+        ...
 
     def _setup_signals(self):
-        ...
+        self.connect("page-added", self._page_added)
+        self.switch_page_id = \
+            self.connect_after("switch-page", self._switch_page)
 
     def _subscribe_to_events(self):
         ...
@@ -37,51 +36,40 @@ class TabsWidget(Gtk.ButtonBox):
     def _load_widgets(self):
         ...
 
-    def add_tab(self, event: Code_Event_Types.CodeEvent):
-        """Add a tab widget for the given file event."""
-        if not hasattr(self, 'tabs'):
-            return
-            
-        tab      = TabWidget()
-        tab.file = event.file
+    def _page_added(self, notebook, page_widget, page_num):
+        tab = self.get_tab_label(page_widget)
+        tab.set_close_signal(self._close_tab)
 
-        tab.label.set_label(event.file.fname)
+        page_widget.show()
+        self.set_tab_detachable(page_widget, True)
+        self.set_tab_reorderable(page_widget, True)
 
-        def select_signal(widget, eve, file):
-            self.code_base.active_view.command.exec_with_args(
-                "set_buffer",
-                (self.code_base.active_view, file)
+    def _close_tab(self, tab, eve, file):
+        event = Event_Factory.create_event(
+            "remove_file",
+            buffer = tab.get_parent().file.buffer
+        )
+
+        self.message(event)
+
+    def _switch_page(self, notebook, page_widget, page_num):
+        tab   = self.get_tab_label(page_widget)
+        event = Event_Factory.create_event(
+            "set_active_file",
+            buffer = tab.file.buffer
+        )
+
+        self.message(event)
+
+    def view_changed(self, buffer):
+        for page_widget in self.get_children():
+            tab = self.get_tab_label(page_widget)
+            if not buffer == tab.file.buffer: continue
+
+            self.handler_block(self.switch_page_id)
+
+            self.set_current_page(
+                self.page_num(page_widget)
             )
 
-        def close_signal(widget, eve, file):
-            self.code_base.files_controller.remove_file(file.buffer)
-
-        tab.set_select_signal(select_signal)
-        tab.set_close_signal(close_signal)
-
-        self.tabs.add(tab)
-
-    def remove_tab(self, event: Code_Event_Types.CodeEvent):
-        """Remove a tab widget for the given file event."""
-        if not hasattr(self, 'tabs'):
-            return
-            
-        for child in self.tabs.get_children():
-            if not child.file == event.file: continue
-
-            self.tabs.remove(child)
-            child.clear_signals_and_data()
-            del child
-
-            return
-    
-    def update_tab_label(self, event: Code_Event_Types.CodeEvent):
-        """Update tab label for the given file event."""
-        if not hasattr(self, 'tabs'):
-            return
-            
-        for tab in self.tabs.get_children():
-            if not tab.file == event.file: continue
-            tab.label.set_label(event.file.fname)
-
-            return
+            self.handler_unblock(self.switch_page_id)