Bugfix for Lua comments with apostrophe

Author: RonOrca

AUTHORS.rst

@@ -14,3 +14,4 @@ Contributors
 * Ivan Poluyanov <[email protected]> `@poluyanov <https://github.com/poluyanov>`_
 * Raymond Lau <[email protected]> `@Raymond26 <https://github.com/Raymond26>`_
 * Luca Comellini <[email protected]> `@lucacome <https://github.com/lucacome>`_
+* Ron Vider <[email protected]> `@RonVider <https://github.com/RonVider>`_

crossplane/ext/lua.py

@@ -6,6 +6,25 @@
 from crossplane.ext.abstract import CrossplaneExtension
 
 
+class EmplaceIter:
+    def __init__(self, it):
+        self.it = it
+        self.ret = []
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        if len(self.ret) > 0:
+            v = self.ret.pop()
+            return v
+        return next(self.it)
+
+    def put_back(self, v):
+        self.ret.append(v)
+
+
+
 class LuaBlockPlugin(CrossplaneExtension):
     """
     This plugin adds special handling for Lua code block directives (*_by_lua_block)
@@ -64,10 +83,23 @@ def lex(self, char_iterator, directive):
 
         depth += 1
 
+        char_iterator = EmplaceIter(char_iterator)
+
         # Grab everything in Lua block as a single token
         # and watch for curly brace '{' in strings
         for char, line in char_iterator:
-            if char == '{':
+            if char == '-':
+                prev_char, prev_line = char, line
+                char, comment_line = next(char_iterator)
+                if char == '-':
+                    token += '-'
+                    while char != '\n':
+                        token += char
+                        char, line = next(char_iterator)
+                else:
+                    char_iterator.put_back((char, comment_line))
+                    char, line = prev_char, prev_line
+            elif char == '{':
                 depth += 1
             elif char == '}':
                 depth -= 1

tests/configs/lua-block-simple/nginx.conf

@@ -31,7 +31,7 @@ http {
     upstream foo {
         server 127.0.0.1;
         balancer_by_lua_block {
-            -- use Lua to do something interesting here
+            -- use Lua that'll do something interesting here
         }
         log_by_lua_block {
             print("I need no extra escaping here, for example: \r\nblah")

tests/ext/test_lua.py

@@ -61,7 +61,7 @@ def test_lex_lua_block_simple():
         ('127.0.0.1', 32),
         (';', 32),
         ('balancer_by_lua_block', 33),
-        ('\n            -- use Lua to do something interesting here\n        ', 35),
+        ('\n            -- use Lua that\'ll do something interesting here\n        ', 35),
         (';', 35),
         ('log_by_lua_block', 36),
         ('\n            print("I need no extra escaping here, for example: \\r\\nblah")\n        ', 38),
@@ -277,7 +277,7 @@ def test_parse_lua_block_simple():
                                     {
                                         'line': 33,
                                         'args': [
-                                            '\n            -- use Lua to do something interesting here'
+                                            '\n            -- use Lua that\'ll do something interesting here'
                                             '\n        '
                                         ],
                                         'directive': 'balancer_by_lua_block'