Fixed modules not being a restricted keyword. Fixes #993

The name is now also checked against the keyword list in singularized form.
Also fixed an undefined error in the js error hint

IHP/IDE/SchemaDesigner/Controller/Validation.hs

@@ -24,7 +24,7 @@ isIllegalKeyword :: Text -> Bool
 isIllegalKeyword input =
     case input of
         "_" -> True
-        _ -> isSQLKeyword input || isHaskellKeyword input
+        _ -> isSQLKeyword input || (isHaskellKeyword (singularize input))
 
 isSQLKeyword :: Text -> Bool
 isSQLKeyword input = case (toUpper input) of

lib/IHP/static/IDE/ihp-schemadesigner.js

@@ -4,14 +4,14 @@ function initSchemaDesigner() {
         var reservedKeywords = [ "_", "as", "case", "class", "data", "default", "deriving", "do", "else", "hiding", "if"
         , "import", "in", "infix", "infixl", "infixr", "instance", "let", "module", "newtype", "of", "qualified", "then"
         , "type", "where", "forall", "mdo", "family", "role", "pattern", "static", "group", "by", "using", "foreign", "export"
-        , "label", "dynamic", "safe", "interruptible", "unsafe", "stdcall", "ccall", "capi", "prim", "javascript", "rec", "proc" ]
+        , "label", "dynamic", "safe", "interruptible", "unsafe", "stdcall", "ccall", "capi", "prim", "javascript", "rec", "proc" ];
         if (reservedKeywords.includes(this.value)) {
             this.classList = "form-control is-invalid"
             var warning = document.createElement("div");
             warning.innerHTML =
 		"'" + this.value + "' is a reserved keyword in Haskell. "
 		+ "Consider renaming it to '"
-		+ this.dataset.tableNameSingular + "_" + this.value
+		+ (this.dataset.tableNameSingular || 'something') + "_" + this.value
 		+ "'.";
             warning.classList = "invalid-feedback";
             warning.setAttribute("id", "warningText");