vim-eof-comment 0.3.5__tar.gz → 0.3.6__tar.gz

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vim-eof-comment
-Version: 0.3.5
+Version: 0.3.6
 Summary: Adds Vim EOF comments for given filetypes in given directories
 Author-email: Guennadi Maximov C <g.maxc.fox@protonmail.com>
 Maintainer-email: Guennadi Maximov C <g.maxc.fox@protonmail.com>

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/pyproject.toml

@@ -34,7 +34,7 @@ maintainers = [{ name = "Guennadi Maximov C", email = "g.maxc.fox@protonmail.com
 name = "vim-eof-comment"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.3.5"
+version = "0.3.6"
 
     [project.scripts]
     vim-eof-comment = "vim_eof_comment.eof:main"

vim_eof_comment-0.3.6/version.txt

@@ -0,0 +1 @@
+0.3.6

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/__init__.pyi

@@ -11,4 +11,5 @@ from .version import version_info as version_info
 __all__ = ['args', 'comments', 'eof', 'file', 'main', 'regex', 'types', 'util', 'version', 'version_info']
 
 version: str
+
 # vim: set ts=4 sts=4 sw=4 et ai si sta:

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/args/__init__.pyi

@@ -2,4 +2,5 @@ from . import completion as completion
 from . import parsing as parsing
 
 __all__ = ['completion', 'parsing']
+
 # vim: set ts=4 sts=4 sw=4 et ai si sta:

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/comments/__init__.pyi

@@ -2,4 +2,5 @@ from . import generator as generator
 from . import types as types
 
 __all__ = ['generator', 'types']
+
 # vim: set ts=4 sts=4 sw=4 et ai si sta:

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/eof.py

@@ -32,7 +32,7 @@ _RESET: int = Style.RESET_ALL
 def eof_comment_search(
     files: Dict[str, BatchPathDict],
     comments: Comments,
-    verbose: bool
+    **kwargs
 ) -> Dict[str, EOFCommentSearch]:
     """
     Search through opened files.
@@ -43,8 +43,8 @@ def eof_comment_search(
         A dictionary of ``str`` to ``BatchPathDict`` objects.
     comments : Comments
         The ``Comments`` object containing the hardcoded comments per file extension.
-    verbose : bool
-        Sets verbose mode.
+    **kwargs
+        COntains the ``verbose`` and ``newline`` boolean options.
 
     Returns
     -------
@@ -58,6 +58,9 @@ def eof_comment_search(
     vim_eof_comment.types.EOFCommentSearch
         The object type for the returning dictionary values.
     """
+    verbose: bool = kwargs.get("verbose", False)
+    newline: bool = kwargs.get("newline", False)
+
     result: Dict[str, EOFCommentSearch] = dict()
     comment_map = comments.generate()
 
@@ -72,7 +75,7 @@ def eof_comment_search(
         last_line, has_nwl = wrapper["line"], wrapper["has_nwl"]
 
         verbose_print(f"{_RESET} - {path} ==> ", verbose=verbose, end="", sep="")
-        if last_line != comment_map[ext]:
+        if last_line != comment_map[ext] or (newline and not has_nwl):
             verbose_print(f"{_BRIGHT}{_RED}CHANGED", verbose=verbose)
             result[path] = EOFCommentSearch(
                 state=IOWrapperBool(file=open(path, "r"), has_nwl=has_nwl),
@@ -162,7 +165,7 @@ def main() -> int:
     if len(files) == 0:
         die("No matching files found!", code=1)
 
-    results = eof_comment_search(files, comments, verbose)
+    results = eof_comment_search(files, comments, verbose=verbose, newline=newline)
     if len(results) > 0:
         append_eof_comment(results, comments, newline)
 

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/eof.pyi

@@ -5,7 +5,7 @@ from .types import BatchPathDict, EOFCommentSearch
 
 __all__ = ['append_eof_comment', 'eof_comment_search', 'main']
 
-def eof_comment_search(files: dict[str, BatchPathDict], comments: Comments, verbose: bool) -> dict[str, EOFCommentSearch]:
+def eof_comment_search(files: dict[str, BatchPathDict], comments: Comments, **kwargs) -> dict[str, EOFCommentSearch]:
     """
     Search through opened files.
 
@@ -15,8 +15,8 @@ def eof_comment_search(files: dict[str, BatchPathDict], comments: Comments, verb
         A dictionary of ``str`` to ``BatchPathDict`` objects.
     comments : Comments
         The ``Comments`` object containing the hardcoded comments per file extension.
-    verbose : bool
-        Sets verbose mode.
+    **kwargs
+        COntains the ``verbose`` and ``newline`` boolean options.
 
     Returns
     -------

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/file.py

@@ -78,14 +78,7 @@ def open_batch_paths(paths: List[BatchPairDict]) -> Dict[str, BatchPathDict]:
     return result
 
 
-def modify_file(
-    file: TextIOWrapper,
-    comments: Dict[str, str],
-    ext: str,
-    newline: bool,
-    has_nwl: bool,
-    matching: bool
-) -> str:
+def modify_file(file: TextIOWrapper, comments: Dict[str, str], ext: str, **kwargs) -> str:
     """
     Modify a file containing a bad EOF comment.
 
@@ -97,24 +90,23 @@ def modify_file(
         A filetype-to-comment dictionary.
     ext : str
         The filetype extension given by the user.
-    newline : bool
-        Flag to whether add a newline before the comment.
-    has_nwl : bool
-        Indicates whether the file already has a newline at the end
-        (not counting LF/CRLF line endings).
-    matching : bool
-        Indicates whether the file already has a matching EOF comment.
+    **kwargs
+        Contains the ``newline``, ``has_nwl`` and ``matching`` boolean attributes.
 
     Returns
     -------
     str
         The modified contents of the given file.
     """
+    has_nwl: bool = kwargs.get("has_nwl", False)
+    matching: bool = kwargs.get("matching", False)
+    newline: bool = kwargs.get("newline", False)
+
     data: List[str] = file.read().split("\n")
     file.close()
 
     data_len = len(data)
-    comment = comments[ext]
+    comment = comments[ext] if not (newline and not has_nwl) else f"\n{comments[ext]}"
     if data_len == 0:
         data = [comment, ""]
     elif data_len == 1:
@@ -128,9 +120,6 @@ def modify_file(
         else:
             data.insert(-1, comment)
 
-    if newline and not has_nwl:
-        data.insert(-2, "")  # Newline
-
     return "\n".join(data)
 
 
@@ -149,18 +138,17 @@ def get_last_line(file: TextIOWrapper) -> LineBool:
         An object containing both the last line in a string and a boolean indicating a newline.
     """
     data: List[str] = file.read().split("\n")
-    has_newline = False
-    line = ""
+    file.close()
+
+    has_newline, line = False, ""
     if len(data) == 1:
         line = data[0]
-    elif len(data) >= 2:
+    else:
         if len(data) >= 3:
             has_newline = data[-3] == ""
 
         line: str = data[-2]
 
-    file.close()
-
     return LineBool(line=line, has_nwl=has_newline)
 
 # vim: set ts=4 sts=4 sw=4 et ai si sta:

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/file.pyi

@@ -34,7 +34,7 @@ def open_batch_paths(paths: list[BatchPairDict]) -> dict[str, BatchPathDict]:
     Dict[str, BatchPathDict]
         A ``str`` to ``BatchPathDict``` dictionary.
     """
-def modify_file(file: TextIOWrapper, comments: dict[str, str], ext: str, newline: bool, has_nwl: bool, matching: bool) -> str:
+def modify_file(file: TextIOWrapper, comments: dict[str, str], ext: str, **kwargs) -> str:
     """
     Modify a file containing a bad EOF comment.
 
@@ -46,13 +46,8 @@ def modify_file(file: TextIOWrapper, comments: dict[str, str], ext: str, newline
         A filetype-to-comment dictionary.
     ext : str
         The filetype extension given by the user.
-    newline : bool
-        Flag to whether add a newline before the comment.
-    has_nwl : bool
-        Indicates whether the file already has a newline at the end
-        (not counting LF/CRLF line endings).
-    matching : bool
-        Indicates whether the file already has a matching EOF comment.
+    **kwargs
+        Contains the ``newline``, ``has_nwl`` and ``matching`` boolean attributes.
 
     Returns
     -------

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment/version.py

@@ -212,6 +212,7 @@ version_info: VersionInfo = VersionInfo([
     (0, 3, 3),
     (0, 3, 4),
     (0, 3, 5),
+    (0, 3, 6),
 ])
 
 

{vim_eof_comment-0.3.5 → vim_eof_comment-0.3.6}/vim_eof_comment.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vim-eof-comment
-Version: 0.3.5
+Version: 0.3.6
 Summary: Adds Vim EOF comments for given filetypes in given directories
 Author-email: Guennadi Maximov C <g.maxc.fox@protonmail.com>
 Maintainer-email: Guennadi Maximov C <g.maxc.fox@protonmail.com>

vim_eof_comment-0.3.5/version.txt

@@ -1 +0,0 @@
-0.3.5