solved #149

weso · Aug 10, 2020 · 27ebec4 · 27ebec4
1 parent bf9ca97
commit 27ebec4
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/dist/yashe.bundled.min.js b/dist/yashe.bundled.min.js
diff --git a/lib/grammar/tokenizer.js b/lib/grammar/tokenizer.js
@@ -522,15 +522,14 @@ CodeMirror.defineMode("shex", function(config, parserConfig) {
 
         if(topSymbol=='nodeConstraint'){
           if(token!='['){
-            if(!token.match(grammar.keywords)){
-            tokenOb.style='constraint';
+            if(!token.match(grammar.keywords) || token == 'IRI_REF'){ //IRI_REF MATCHES WITH IRI
+              tokenOb.style='constraint';
             }else{
               tokenOb.style='constraintKeyword';
             }
           }
         }
 
-
         if (!ll1_table[topSymbol]) {
           // Top symbol is a terminal
           if (topSymbol == token) {

diff --git a/src/config/defaults.js b/src/config/defaults.js
@@ -12,12 +12,13 @@ YASHE.defaults = $.extend(true, {}, YASHE.defaults, {
   /**
 	 *  Default shape 
 	 */
-  value:  `PREFIX :        <http://example.org/>
-  PREFIX schema:  <http://schema.org/>
-  PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
+  value:  `PREFIX :       <http://example.org/>
+  PREFIX schema: <http://schema.org/>
+  PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#>
   
-  
-  :Product ( schema:name 
+  :User {
+    schema:name         <wtf> ;
+  }
   
 `,
 

diff --git a/src/utils/syntaxUtils.js b/src/utils/syntaxUtils.js
@@ -76,13 +76,17 @@ var checkSyntax = function(yashe) {
       let lineTokens = yashe.getLineTokens(l);
       for(let t in lineTokens){
         let token = lineTokens[t];
-        //This is only necessary to verify the if the last '}' is missing  (See #104)
+        // This is only necessary to verify the if the last '}' is missing 
+        // (See #104 https://github.com/weso/YASHE/issues/104)
         if(token.string=='{'){
           openBracketsCounter++;
         }
         if(token.string=='}'){
           closedBracketsCounter++;
         }
+
+        //This is only necessary to verify the if the last ')' is missing  (See #104)
+        // (See #150 https://github.com/weso/YASHE/issues/150)
         if(token.string=='('){
           openParenthesisCounter++;
         }
@@ -94,13 +98,14 @@ var checkSyntax = function(yashe) {
       updateShapesAndPrefixes(yashe,l);
     }
 
-    //Is last '}' missing?  (See #104)
+    //Is last '}' missing?  (See #104 https://github.com/weso/YASHE/issues/104)
     if(openBracketsCounter != closedBracketsCounter){
       setError(yashe.lastLine(),"This line is invalid. Expected: '}'",yashe)
       yashe.queryValid = false;
       return false;
     }
 
+    //Is last ')' missing?  (See #150 https://github.com/weso/YASHE/issues/150)
     if(openParenthesisCounter != closedParenthesisCounter){
       setError(yashe.lastLine(),"This line is invalid. Expected: ')'",yashe)
       yashe.queryValid = false;
@@ -134,8 +139,7 @@ var checkSyntax = function(yashe) {
       let token = lineTokens[t];
 
 
-      if(token.type=='string-2' || 
-        token.type=='constraint'){
+      if(token.type=='string-2'|| (token.type=='constraint' && token.string.includes(":"))){
         yashe.usedPrefixes.push({
             alias:token.string.split(":")[0]+':',
             line:l });