Allow multiple whitespace before [if] and [in]

ticoneva · Sep 16, 2022 · 41379a0 · 41379a0
1 parent 0d73395
commit 41379a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/pystata-kernel/__init__.py b/pystata-kernel/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '0.2.2'
+__version__ = '0.2.3'
 
 from .kernel import PyStataKernel
diff --git a/pystata-kernel/kernel.py b/pystata-kernel/kernel.py
@@ -1,6 +1,6 @@
 '''
 pystata-kernel
-Version: 0.2.2
+Version: 0.2.3
 A simple Jupyter kernel based on pystata.
 Requires Stata 17 and stata_setup.
 '''
@@ -13,7 +13,7 @@
 
 class PyStataKernel(IPythonKernel):
     implementation = 'pystata-kernel'
-    implementation_version = '0.2.2'
+    implementation_version = '0.2.3'
     language = 'stata'
     language_version = '17'
     language_info = {

diff --git a/pystata-kernel/magics.py b/pystata-kernel/magics.py
@@ -73,8 +73,7 @@ class StataMagics():
     html_help = urllib.parse.urljoin(html_base, "help.cgi?{}")
 
     magic_regex = re.compile(
-        #r'\A(%|\*%)(?P<magic>.+?)(?P<code>\s+.*)?\Z', flags=re.DOTALL + re.MULTILINE)
-        r'\A(%|\*%)(?P<magic>.+?)(?P<code>\s+(?!if\s)(?!in\s).+?)?(?P<if>\sif\s+.+?)?(?P<in>\s+in\s+.+?)?\Z', flags=re.DOTALL + re.MULTILINE)
+        r'\A(%|\*%)(?P<magic>.+?)(?P<code>\s+(?!if\s)(?!\sif)(?!in\s)(?!\sin).+?)?(?P<if>\s+if\s+.+?)?(?P<in>\s+in\s+.+?)?\Z', flags=re.DOTALL + re.MULTILINE)
 
     # Format: magic_name: help_content
     available_magics = {

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='pystata-kernel',
-    version='0.2.2',
+    version='0.2.3',
     packages=['pystata-kernel'],
     package_data={'pystata-kernel': ['logo-64x64.png']},
     description='A simple Jupyter kernel for Stata based on pystata',