fixes #706, fixes #743, fixes #699

increpare · increpare · commit cd060427c30e · 2021-08-13T19:51:53.000+02:00
diff --git a/src/js/codemirror/anyword-hint.js b/src/js/codemirror/anyword-hint.js
@@ -148,6 +148,7 @@
             var excludeProperties = false;
             var excludeAggregates = false;
             var candlists = [];
+            var toexclude = [];
             switch (state.section) {
                 case 'objects':
                     {
@@ -158,6 +159,10 @@
                     }
                 case 'legend':
                     {
+                        var splits = lineToCursor.toLowerCase().split(/[\p{Z}\s]/u).filter(function(v) {
+                            return v !== '';
+                        });
+                        toexclude=splits;
                         if (lineToCursor.indexOf('=')>=0){
                             if ((lineToCursor.trim().split(/\s+/ ).length%2)===1){
                                 addObjects=true;
@@ -177,7 +182,12 @@
                     }
                 case 'collisionlayers':
                     {
+                        var splits = lineToCursor.toLowerCase().split(/[,\p{Z}\s]/u).filter(function(v) {
+                            return v !== '';
+                        });
+                        toexclude=splits;
                         addObjects=true;
+                        excludeAggregates=true;
                         break;
                     }
                 case 'rules':
@@ -312,7 +322,15 @@
             //state.legend_properties
             //state.objects
 
-            //if list is a single word and that matches what the current word is, don't show hint
+            //remove words from the toexclude list
+            for (var i=0;i<list.length;i++){
+                var lc = list[i].text.toLowerCase();
+                if (toexclude.indexOf(lc)>=0){
+                    list.splice(i,1);
+                    i--;
+                }
+            }
+                    //if list is a single word and that matches what the current word is, don't show hint
             if (list.length===1 && list[0].text.toLowerCase()===curWord){
                 list=[];
             }
diff --git a/src/js/compiler.js b/src/js/compiler.js
@@ -2682,7 +2682,7 @@ function loadFile(str) {
         while (ss.eol() === false);
     }
 
-    delete state.lineNumber;
+    // delete state.lineNumber;
 
     generateExtraMembers(state);
     generateMasks(state);
diff --git a/src/js/parser.js b/src/js/parser.js
@@ -801,7 +801,7 @@ var codeMirrorFn = function() {
 	                            }
                                 if (splits.indexOf(candname, 2)>=2) {
                                     logError("You can't define object " + candname.toUpperCase() + " in terms of itself!", state.lineNumber);
-                                    ok = false;
+                                    // ok = false;
                                 }
                                 checkNameNew(state,candname);
                         	}

Original file line number	Diff line number	Diff line change
`@@ -2682,7 +2682,7 @@ function loadFile(str) {`
`2682`	`2682`	`while (ss.eol() === false);`
`2683`	`2683`	`}`
`2684`	`2684`
`2685`		`- delete state.lineNumber;`
	`2685`	`+ // delete state.lineNumber;`
`2686`	`2686`
`2687`	`2687`	`generateExtraMembers(state);`
`2688`	`2688`	`generateMasks(state);`
Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ var codeMirrorFn = function() {`
`801`	`801`	`}`
`802`	`802`	`if (splits.indexOf(candname, 2)>=2) {`
`803`	`803`	`logError("You can't define object " + candname.toUpperCase() + " in terms of itself!", state.lineNumber);`
`804`		`- ok = false;`
	`804`	`+ // ok = false;`
`805`	`805`	`}`
`806`	`806`	`checkNameNew(state,candname);`
`807`	`807`	`}`