check yashe errors before wikiformat

src/config/defaults.js

@@ -12,25 +12,42 @@ YASHE.defaults = $.extend(true, {}, YASHE.defaults, {
   /**
 	 *  Default shape 
 	 */
-  value:  `PREFIX p:    <http://www.wikidata.org/prop/>
-  PREFIX ps:   <http://www.wikidata.org/prop/statement/>
-  PREFIX pq:   <http://www.wikidata.org/prop/qualifier/>
-  PREFIX wd:   <http://www.wikidata.org/entity/>
-  PREFIX wdt:  <http://www.wikidata.org/prop/direct/>
-  PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#>
-
-  start = @<#operating_system>
-
-  <#operating_system> {
-    p:P31  [ wd:Q9135 ] ;  #instancia de #sistema operativo  
-    p:P31  [ wd:Q42 ] ;  #instancia de #Douglas Adams  
-    p:P31  [ wd:Q5 ] #instancia de #ser humano  
-  }
-
-
-
+  value:  `
+  PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX wd: <http://www.wikidata.org/entity/>
+PREFIX wdt: <http://www.wikidata.org/prop/direct/>
 
-
+start = @<human>
+
+<human> EXTRA wdt:P31 {
+  wdt:P31 [wd:Q5];
+  wdt:P21 [wd:Q6581097 wd:Q6581072 wd:Q1097630 wd:Q1052281 wd:Q2449503 wd:Q48270]?;  
+  wdt:P19 . ?;                    
+  wdt:P569 . ? ;               
+  wdt:P735 . * ;                
+  wdt:P734 . * ;               
+  wdt:P106 . * ;                
+  wdt:P27 @<country> *;  
+  wdt:P22 @<human> *;          
+  wdt:P25 @<human> *;          
+  wdt:P3373 @<human> *;         
+  wdt:P26 @<human> *;         
+  wdt:P40 @<human> *;          
+  wdt:P1038 @<human> *;       
+  wdt:P103 @<language> *;
+  wdt:P1412 @<language> *;
+  wdt:P6886  @<language> *;
+  rdfs:label rdf:langString+;
+}
+
+<country> EXTRA wdt:P31 {
+  wdt:P31 [wd:Q6256 wd:Q3024240 wd:Q3624078] +;
+}
+
+<language> EXTRA wdt:P31 {
+  wdt:P31 [wd:Q34770 wd:Q1288568] +;
+} 
 `,
 
   highlightSelectionMatches: {

src/utils/formatUtils.js

@@ -157,6 +157,7 @@ var copyLineDown = function(yashe) {
 
 
   var wikiFormat = async function(yashe){
+    if(yashe.hasErrors())return;
     yashe.prettify();
     yashe.setOption('readOnly',true);
 
@@ -181,7 +182,7 @@ var copyLineDown = function(yashe) {
                     dataType: 'jsonp',
             })
             if(result.entities){
-              comments +=' #'+result.entities[entity].labels[language].value;
+              comments +=' # '+result.entities[entity].labels[language].value;
               valueSetSize--;
               if(valueSetSize<0){
                 let replacement = '';

src/utils/pretty/prettyUtils.js

@@ -17,11 +17,6 @@ function prettify(yashe){
     let shapesStr = getShapesStr(shapes);
     let prettified = initialComments+initialDirectivesAndStartsStr+shapesStr;
 
-
-
-
-
-
     // Is there any change?
     // It is true that without this check the user
     // wouldn't appreciate the difference but yashe
@@ -459,11 +454,13 @@ function prettifyComments(){
     let longest = getLongestCommentedLine();
     for (var l = 0; l < yashe.lineCount(); ++l) {
         let lineTokens = formatUtils.getNonWsLineTokens(yashe.getLineTokens(l));
-        lineTokens.map(t=>{
-            if(t.type == 'comment') {
-                yashe.replaceRange(printUtils.getSeparator(longest-t.start)+t.string,{line:l,ch:t.start},{line:l,ch:t.end})
-            }
-        });
+        if(!hasOnlyComments(lineTokens)){
+            lineTokens.map(t=>{
+                if(t.type == 'comment') {
+                    yashe.replaceRange(printUtils.getSeparator(longest-t.start)+t.string,{line:l,ch:t.start},{line:l,ch:t.end})
+                }
+            });
+        }
     }
 }
 
@@ -479,6 +476,16 @@ function getLongestCommentedLine(){
     return longest;
 }
 
+/**
+ * Returns true if the line has onlyComments
+ */
+function hasOnlyComments(lineTokens){
+    return lineTokens.reduce((acc,t)=>{
+        if(t.type!='comment')acc=false;
+        return acc;
+    },true);
+}
+
 
 function isCursorToken(token1,token2,line){
     return  token1.start == token2.start