Remove brackets from comments in the same line

Signed-off-by: Juanjo Alvarez <[email protected]>

Author: Juanjo Alvarez

.gitignore

@@ -1,111 +1,2 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# IPython Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# dotenv
-.env
-
-# virtualenv
-venv/
-ENV/
-
-# Spyder project settings
-.spyderproject
-
-# Rope project settings
-.ropeproject
-
-.idea/*
-
-test/nimcache/*
-test/sendmsg
-
-# pycharm
-.idea/*
-
-# virtualenv
-36env/*
-install.sh
-mypy/*
-
-Dockerfile
-
-.sdk/*
-driver/main
-main
-.local/*
-
-.mypy_cache
+.sdk
+build

native/python_package/python_driver/astimprove.py

@@ -245,19 +245,17 @@ def _create_nooplines_list(startline: int, noops_previous: List[str]) -> List[No
         # finishing newline
         noops_sameline: List[Token] = [i for i in self.sameline_remainder_noops(node) if i]
 
-        joined_sameline = []
-        for tok in noops_sameline:
-            if tok.value.lstrip().startswith('\n'):
-                joined_sameline.append(tok.value.lstrip()[1:])
-            else:
-                joined_sameline.append(tok.value)
+        def new_noopline(s: str) -> Dict[str, str]:
+            return {"ast_type": "NoopSameLine", "s": s}
+
+        noop_lines = [new_noopline(i.value.strip()) for i in noops_sameline]
 
         if noops_sameline:
             node['noops_sameline'] = {
                 "ast_type": "SameLineNoops",
                 "lineno": node.get("lineno", 0),
                 "col_offset": noops_sameline[0].start.col,
-                "noop_line": joined_sameline,
+                "noop_line": noop_lines,
                 "end_lineno": node.get("lineno", 0),
                 "end_col_offset": max(noops_sameline[-1].end.col, 1)
             }
@@ -464,7 +462,7 @@ def visit(self, node: Node, root: bool=False) -> VisitResult:
                 visit_result["col_offset"] = max(visit_result.get("col_offset", 1) + 1, 1)
 
             if "end_col_offset" in visit_result:
-                visit_result["end_col_offset"] = max(visit_result["end_col_offset"], 1)
+                visit_result["end_col_offset"] = max(visit_result["end_col_offset"] + 1, 1)
 
         visit_result.pop('_fields', None)
         visit_result.pop('_attributes', None)