Merge pull request #1357 from input-output-hk/broken-regex

fix regex that failed for multiline mkFunctions and add a test
IntersectMBO · Aug 13, 2019 · 53ba606 · 53ba606
2 parents 68a5529 + 61a08e1
commit 53ba606
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/plutus-playground-server/src/Playground/Interpreter.hs b/plutus-playground-server/src/Playground/Interpreter.hs
@@ -44,7 +44,11 @@ replaceModuleName script =
 ensureMkFunctionExists :: Text -> Text
 ensureMkFunctionExists script =
     let scriptString = Text.unpack script
-        regex = Regex.mkRegex "^\\$\\(mkFunctions \\[.*])"
+        -- I don't really like this regex as it doesn't require properly formed mkFunctions
+        -- however I couldn't find a better regex that worked for all current usecases
+        -- additionally I think this check is strong enough to decide whether to add the
+        -- empty $(mkFunctions [])
+        regex = Regex.mkRegex "^\\$\\(mkFunctions[ \n\t].*"
         mMatches = Regex.matchRegexAll regex scriptString
      in case mMatches of
             Nothing -> script <> "\n$(mkFunctions [])"

diff --git a/plutus-playground-server/usecases/Game.hs b/plutus-playground-server/usecases/Game.hs
@@ -103,7 +103,11 @@ startGame =
     -- Player 2's wallet is aware of the game address.
     startWatching gameAddress
 
-$(mkFunctions ['lock, 'guess, 'startGame])
+$(mkFunctions 
+    ['lock
+    , 'guess
+    , 'startGame
+    ])
 
 {- Note [Contract endpoints]