vim-eof-comment 0.3.14__tar.gz → 0.3.16__tar.gz

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: vim-eof-comment
-Version: 0.3.14
-Summary: Adds Vim EOF comments for given filetypes in given directories
+Version: 0.3.16
+Summary: Adds Vim EOF modeline 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>
 License-Expression: GPL-2.0-only
+Project-URL: Download, https://github.com/DrKJeff16/vim-eof-comment/releases/latest
 Project-URL: Issues, https://github.com/DrKJeff16/vim-eof-comment/issues
 Project-URL: Repository, https://github.com/DrKJeff16/vim-eof-comment
-Project-URL: Download, https://github.com/DrKJeff16/vim-eof-comment/releases/latest
 Keywords: eof comments,eof,files,preprocessing,text,vim modeline,vim,vim-eof
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/pyproject.toml

@@ -21,15 +21,8 @@ classifiers = [
     "Topic :: Utilities",
     "Typing :: Typed",
 ]
-dependencies = [
-    "argcomplete",
-    "argparse",
-    "colorama",
-    "setuptools",
-    "typing",
-    "wheel",
-]
-description = "Adds Vim EOF comments for given filetypes in given directories"
+dependencies = ["argcomplete", "argparse", "colorama", "setuptools", "typing", "wheel"]
+description = "Adds Vim EOF modeline comments for given filetypes in given directories"
 keywords = [
     "eof comments",
     "eof",
@@ -46,15 +39,15 @@ 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.14"
+version = "0.3.16"
 
     [project.scripts]
     vim-eof-comment = "vim_eof_comment.eof:main"
 
     [project.urls]
+    Download   = "https://github.com/DrKJeff16/vim-eof-comment/releases/latest"
     Issues     = "https://github.com/DrKJeff16/vim-eof-comment/issues"
     Repository = "https://github.com/DrKJeff16/vim-eof-comment"
-    Download   = "https://github.com/DrKJeff16/vim-eof-comment/releases/latest"
 
 [tool.numpydoc_validation]
 checks = [

vim_eof_comment-0.3.16/version.txt

@@ -0,0 +1 @@
+0.3.16

vim_eof_comment-0.3.16/vim_eof_comment/comments/filetypes.json

@@ -0,0 +1 @@
+[{ "C": "/* {comment} */", "H": "/* {comment} */", "Makefile": "# {comment}", "bash": "# {comment}", "c": "/* {comment} */", "cc": "/* {comment} */", "cpp": "/* {comment} */", "css": "/* {comment} */", "fish": "# {comment}", "h": "/* {comment} */", "hh": "/* {comment} */", "hpp": "/* {comment} */", "htm": "<!-- {comment} -->", "html": "<!-- {comment} -->", "javascript": "/* {comment} */", "javascriptreact": "/* {comment} */", "js": "/* {comment} */", "jsx": "/* {comment} */", "latex": "% {comment}", "lua": "-- {comment}", "make": "# {comment}", "markdown": "<!-- {comment} -->", "md": "<!-- {comment} -->", "mk": "# {comment}", "py": "# {comment}", "pyi": "# {comment}", "python": "# {comment}", "rb": "# {comment}", "rs": "/* {comment} */", "ruby": "# {comment}", "rust": "/* {comment} */", "sh": "# {comment}", "tex": "% {comment}", "toml": "# {comment}", "ts": "/* {comment} */", "tsx": "/* {comment} */", "typescript": "/* {comment} */", "typescriptreact": "/* {comment} */", "xhtml": "<!-- {comment} -->", "xml": "<!-- {comment} -->", "yaml": "# {comment}", "yml": "# {comment}", "zsh": "# {comment}" }, { "C": { "level": 2, "expandtab": true }, "H": { "level": 2, "expandtab": true }, "Makefile": { "level": 4, "expandtab": false }, "bash": { "level": 4, "expandtab": true }, "c": { "level": 2, "expandtab": true }, "cc": { "level": 2, "expandtab": true }, "cpp": { "level": 2, "expandtab": true }, "css": { "level": 4, "expandtab": true }, "fish": { "level": 4, "expandtab": true }, "h": { "level": 2, "expandtab": true }, "hh": { "level": 2, "expandtab": true }, "hpp": { "level": 2, "expandtab": true }, "htm": { "level": 2, "expandtab": true }, "html": { "level": 2, "expandtab": true }, "javascript": { "level": 4, "expandtab": true }, "javascriptreact": { "level": 4, "expandtab": true }, "js": { "level": 4, "expandtab": true }, "jsx": { "level": 4, "expandtab": true }, "latex": { "level": 2, "expandtab": true }, "lua": { "level": 4, "expandtab": true }, "make": { "level": 4, "expandtab": false }, "markdown": { "level": 2, "expandtab": true }, "md": { "level": 2, "expandtab": true }, "mk": { "level": 4, "expandtab": false }, "py": { "level": 4, "expandtab": true }, "pyi": { "level": 4, "expandtab": true }, "python": { "level": 4, "expandtab": true }, "rb": { "level": 2, "expandtab": true }, "rs": { "level": 4, "expandtab": true }, "ruby": { "level": 2, "expandtab": true }, "rust": { "level": 4, "expandtab": true }, "sh": { "level": 4, "expandtab": true }, "tex": { "level": 2, "expandtab": true }, "toml": { "level": 4, "expandtab": true }, "ts": { "level": 4, "expandtab": true }, "tsx": { "level": 4, "expandtab": true }, "typescript": { "level": 4, "expandtab": true }, "typescriptreact": { "level": 4, "expandtab": true }, "xhtml": { "level": 2, "expandtab": true }, "xml": { "level": 2, "expandtab": true }, "yaml": { "level": 2, "expandtab": true }, "yml": { "level": 2, "expandtab": true }, "zsh": { "level": 4, "expandtab": true } }]

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/vim_eof_comment/comments/generator.py

@@ -19,6 +19,8 @@ from colorama import init as color_init
 from ..types import IndentMap
 from ..util import die
 
+COMMENT_STR: str = "vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:"
+
 _JSON_FILE: str = realpath("./vim_eof_comment/comments/filetypes.json")
 
 _BLUE: int = Fore.BLUE
@@ -49,8 +51,13 @@ def import_json() -> Tuple[Dict[str, str], Dict[str, IndentMap]]:
     file.close()
 
     result: Tuple[Dict[str, str], Dict[str, IndentMap]] = json.loads(data)
+    comments = result[0]
+    maps = result[1]
+
+    for k, v in comments.items():
+        comments[k] = v.format(comment=COMMENT_STR)
 
-    return result[0], result[1]
+    return comments, maps
 
 
 _formats, _DEFAULT = import_json()

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/vim_eof_comment/eof.py

@@ -71,13 +71,13 @@ def eof_comment_search(
         ext: str = file["ft_ext"]
 
         wrapper = get_last_line(file_obj)
-        last_line, has_nwl = wrapper["line"], wrapper["has_nwl"]
+        last_line, had_nwl = wrapper["line"], wrapper["had_nwl"]
 
         verbose_print(f"{_RESET} - {path} ==> ", verbose=verbose, end="", sep="")
-        if last_line != comment_map[ext] or (newline and not has_nwl):
+        if last_line != comment_map[ext] or (newline and not had_nwl):
             verbose_print(f"{_BRIGHT}{_RED}CHANGED", verbose=verbose)
             result[path] = EOFCommentSearch(
-                state=IOWrapperBool(file=open(path, "r"), has_nwl=has_nwl),
+                state=IOWrapperBool(file=open(path, "r"), had_nwl=had_nwl),
                 lang=ext,
                 match=matches(last_line, verbose)
             )
@@ -107,7 +107,7 @@ def append_eof_comment(
     comment_map = comments.generate()
     for path, file in files.items():
         file_obj = file["state"]["file"]
-        has_nwl = file["state"]["has_nwl"]
+        had_nwl = file["state"]["had_nwl"]
         matching = file["match"]
         ext = file["lang"]
 
@@ -116,7 +116,7 @@ def append_eof_comment(
             comment_map,
             ext=ext,
             newline=newline,
-            has_nwl=has_nwl,
+            had_nwl=had_nwl,
             matching=matching
         )
         file_obj = open(path, "w")

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/vim_eof_comment/file.py

@@ -146,15 +146,15 @@ def get_last_line(file: TextIOWrapper) -> LineBool:
     data: List[str] = file.read().split("\n")
     file.close()
 
-    has_newline, line = False, ""
+    had_newline, line = False, ""
     if len(data) <= 1:
         line = data[0]
     elif len(data) >= 2:
         line: str = data[-2]
 
         if len(data) >= 3:
-            has_newline = data[-3] == ""
+            had_newline = data[-3] == ""
 
-    return LineBool(line=line, has_nwl=has_newline)
+    return LineBool(line=line, had_nwl=had_newline)
 
 # vim: set ts=4 sts=4 sw=4 et ai si sta:

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/vim_eof_comment/types.py

@@ -99,7 +99,7 @@ class IndentHandler(TypedDict):
 
 class IOWrapperBool(TypedDict):
     """
-    A dict containing ``file`` and ``has_nwl`` as keys.
+    A dict containing ``file`` and ``had_nwl`` as keys.
 
     This is a ``TypedDict``-like object.
 
@@ -107,17 +107,17 @@ class IOWrapperBool(TypedDict):
     ----------
     file : TextIO
         The opened file as a ``TextIO`` wrapper.
-    has_nwl : bool
+    had_nwl : bool
         Whether the file has a newline or not.
     """
 
     file: TextIO
-    has_nwl: bool
+    had_nwl: bool
 
 
 class LineBool(TypedDict):
     """
-    A dict containing ``line`` and ``has_nwl`` as keys.
+    A dict containing ``line`` and ``had_nwl`` as keys.
 
     This is a ``TypedDict``-like object.
 
@@ -125,12 +125,12 @@ class LineBool(TypedDict):
     ----------
     line : str
         The last line of the target file.
-    has_nwl : bool
+    had_nwl : bool
         Whether the file has a newline or not.
     """
 
     line: str
-    has_nwl: bool
+    had_nwl: bool
 
 
 class BatchPathDict(TypedDict):

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/vim_eof_comment/types.pyi

@@ -73,7 +73,7 @@ class IndentHandler(TypedDict):
 
 class IOWrapperBool(TypedDict):
     """
-    A dict containing ``file`` and ``has_nwl`` as keys.
+    A dict containing ``file`` and ``had_nwl`` as keys.
 
     This is a ``TypedDict``-like object.
 
@@ -81,15 +81,15 @@ class IOWrapperBool(TypedDict):
     ----------
     file : TextIO
         The opened file as a ``TextIO`` wrapper.
-    has_nwl : bool
+    had_nwl : bool
         Whether the file has a newline or not.
     """
     file: TextIO
-    has_nwl: bool
+    had_nwl: bool
 
 class LineBool(TypedDict):
     """
-    A dict containing ``line`` and ``has_nwl`` as keys.
+    A dict containing ``line`` and ``had_nwl`` as keys.
 
     This is a ``TypedDict``-like object.
 
@@ -97,11 +97,11 @@ class LineBool(TypedDict):
     ----------
     line : str
         The last line of the target file.
-    has_nwl : bool
+    had_nwl : bool
         Whether the file has a newline or not.
     """
     line: str
-    has_nwl: bool
+    had_nwl: bool
 
 class BatchPathDict(TypedDict):
     """

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/vim_eof_comment/version.py

@@ -221,6 +221,8 @@ version_info = VersionInfo([
     (0, 3, 12),
     (0, 3, 13),
     (0, 3, 14),
+    (0, 3, 15),
+    (0, 3, 16),
 ])
 
 __version__: str = str(version_info)

{vim_eof_comment-0.3.14 → vim_eof_comment-0.3.16}/vim_eof_comment.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: vim-eof-comment
-Version: 0.3.14
-Summary: Adds Vim EOF comments for given filetypes in given directories
+Version: 0.3.16
+Summary: Adds Vim EOF modeline 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>
 License-Expression: GPL-2.0-only
+Project-URL: Download, https://github.com/DrKJeff16/vim-eof-comment/releases/latest
 Project-URL: Issues, https://github.com/DrKJeff16/vim-eof-comment/issues
 Project-URL: Repository, https://github.com/DrKJeff16/vim-eof-comment
-Project-URL: Download, https://github.com/DrKJeff16/vim-eof-comment/releases/latest
 Keywords: eof comments,eof,files,preprocessing,text,vim modeline,vim,vim-eof
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console

vim_eof_comment-0.3.14/version.txt

@@ -1 +0,0 @@
-0.3.14

vim_eof_comment-0.3.14/vim_eof_comment/comments/filetypes.json

@@ -1 +0,0 @@
-[{ "C": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "H": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "Makefile": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "bash": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "c": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "cc": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "cpp": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "css": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "fish": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "h": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "hh": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "hpp": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "htm": "<!-- vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: -->", "html": "<!-- vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: -->", "javascript": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "javascriptreact": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "js": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "jsx": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "latex": "% vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "lua": "-- vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "make": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "markdown": "<!-- vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: -->", "md": "<!-- vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: -->", "mk": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "py": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "pyi": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "python": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "rb": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "rs": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "ruby": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "rust": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "sh": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "tex": "% vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "toml": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "ts": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "tsx": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "typescript": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "typescriptreact": "/* vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: */", "xhtml": "<!-- vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: -->", "xml": "<!-- vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta: -->", "yaml": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "yml": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:", "zsh": "# vim: set ts={ts} sts={sts} sw={sw} {et} ai si sta:" }, { "C": { "level": 2, "expandtab": true }, "H": { "level": 2, "expandtab": true }, "Makefile": { "level": 4, "expandtab": false }, "bash": { "level": 4, "expandtab": true }, "c": { "level": 2, "expandtab": true }, "cc": { "level": 2, "expandtab": true }, "cpp": { "level": 2, "expandtab": true }, "css": { "level": 4, "expandtab": true }, "fish": { "level": 4, "expandtab": true }, "h": { "level": 2, "expandtab": true }, "hh": { "level": 2, "expandtab": true }, "hpp": { "level": 2, "expandtab": true }, "htm": { "level": 2, "expandtab": true }, "html": { "level": 2, "expandtab": true }, "javascript": { "level": 4, "expandtab": true }, "javascriptreact": { "level": 4, "expandtab": true }, "js": { "level": 4, "expandtab": true }, "jsx": { "level": 4, "expandtab": true }, "latex": { "level": 2, "expandtab": true }, "lua": { "level": 4, "expandtab": true }, "make": { "level": 4, "expandtab": false }, "markdown": { "level": 2, "expandtab": true }, "md": { "level": 2, "expandtab": true }, "mk": { "level": 4, "expandtab": false }, "py": { "level": 4, "expandtab": true }, "pyi": { "level": 4, "expandtab": true }, "python": { "level": 4, "expandtab": true }, "rb": { "level": 2, "expandtab": true }, "rs": { "level": 4, "expandtab": true }, "ruby": { "level": 2, "expandtab": true }, "rust": { "level": 4, "expandtab": true }, "sh": { "level": 4, "expandtab": true }, "tex": { "level": 2, "expandtab": true }, "toml": { "level": 4, "expandtab": true }, "ts": { "level": 4, "expandtab": true }, "tsx": { "level": 4, "expandtab": true }, "typescript": { "level": 4, "expandtab": true }, "typescriptreact": { "level": 4, "expandtab": true }, "xhtml": { "level": 2, "expandtab": true }, "xml": { "level": 2, "expandtab": true }, "yaml": { "level": 2, "expandtab": true }, "yml": { "level": 2, "expandtab": true }, "zsh": { "level": 4, "expandtab": true } }]