Fix comment handling in kernel

Resolves    #851.

Author: evhub

coconut/compiler/util.py

@@ -1925,6 +1925,12 @@ def rem_comment(line):
     return base
 
 
+def get_comment(line):
+    """Extract a comment from a line if it has one."""
+    base, comment = split_comment(line)
+    return comment
+
+
 def should_indent(code):
     """Determines whether the next line should be indented."""
     last_line = rem_comment(code.splitlines()[-1])

coconut/icoconut/root.py

@@ -48,7 +48,7 @@
 from coconut.terminal import logger
 from coconut.util import override, memoize_with_exceptions, replace_all
 from coconut.compiler import Compiler
-from coconut.compiler.util import should_indent, paren_change
+from coconut.compiler.util import should_indent, paren_change, get_comment
 from coconut.command.util import Runner
 
 try:
@@ -214,7 +214,10 @@ def _coconut_assemble_logical_lines():
                     level += paren_change(no_strs_line)
 
                     # put line in parts and break if done
-                    if level < 0:
+                    if get_comment(line):
+                        parts.append(line)
+                        break
+                    elif level < 0:
                         parts.append(line)
                     elif no_strs_line.endswith("\\"):
                         parts.append(line[:-1])

coconut/root.py

@@ -26,7 +26,7 @@
 VERSION = "3.1.1"
 VERSION_NAME = None
 # False for release, int >= 1 for develop
-DEVELOP = 3
+DEVELOP = 4
 ALPHA = False  # for pre releases rather than post releases
 
 assert DEVELOP is False or DEVELOP >= 1, "DEVELOP must be False or an int >= 1"

coconut/tests/src/extras.coco

@@ -612,6 +612,15 @@ def test_kernel() -> bool:
     assert captured_msg_content is None
     assert captured_msg_type["content"]["data"]["text/plain"] == "'()'"
 
+    assert k.do_execute("""[
+    "hey",
+    # "there", # dont want this value now
+    "is comment"
+]""", False, True, {}, True) |> unwrap_future$(loop) |> .["status"] == "ok"
+    captured_msg_type, captured_msg_content = fake_session.captured_messages[-1]
+    assert captured_msg_content is None
+    assert captured_msg_type["content"]["data"]["text/plain"] == "['hey', 'is comment']"
+
     return True