Ticket #19875: 19875.3.patch

src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -356 +356 @@
             final MapCSSStyleSource source = new MapCSSStyleSource("");
             final MapCSSParser preprocessor = new MapCSSParser(css, MapCSSParser.LexicalState.PREPROCESSOR);
             try (StringReader mapcss = new StringReader(preprocessor.pp_root(source))) {
-                new MapCSSParser(mapcss, MapCSSParser.LexicalState.DEFAULT).sheet(source);
+                new MapCSSParser(mapcss, MapCSSParser.LexicalState.DEFAULT).sheet(source, false);
             }
             // Ignore "meta" rule(s) from external rules of JOSM wiki
             source.removeMetaRules();

src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -541 +541 @@
 /**
  * entry point for the main parser
  * @param sheet MapCSS style source
+ * @param metadataOnly if true, stop reading after first rule that is not a meta rule 
  * @throws ParseException in case of parsing error
  */
-void sheet(MapCSSStyleSource sheet):
+void sheet(MapCSSStyleSource sheet, boolean metadataOnly):
 {
 }
 {
@@ -552 +553 @@
     (
         try {
             rule() w()
+            { 
+            if (metadataOnly && !sheet.rules.isEmpty()) {
+                // get first selector of last rule 
+                Selector sel = sheet.rules.get(sheet.rules.size() - 1).selectors.get(0);
+                if (!(sel instanceof GeneralSelector) || !Selector.BASE_META.equals(sel.getBase())) {
+                    return;
+                }
+            }
+            }
         } catch (MapCSSException mex) {
             Logging.error(mex);
             error_skipto(RBRACE, mex);

src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Stopwatch;
 import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -156 +157 @@
     public void loadStyleSource(boolean metadataOnly) {
         STYLE_SOURCE_LOCK.writeLock().lock();
         try {
+            Stopwatch stopwatch = Stopwatch.createStarted();
             init();
             rules.clear();
             ruleIndex.clear();
@@ -168 +170 @@
 
                     // do the actual mapcss parsing
                     try (Reader in2 = new StringReader(preprocessor.pp_root(this))) {
-                        new MapCSSParser(in2, MapCSSParser.LexicalState.DEFAULT).sheet(this);
+                        new MapCSSParser(in2, MapCSSParser.LexicalState.DEFAULT).sheet(this, metadataOnly);
                     }
 
                     loadMeta();
@@ -194 +196 @@
                 Logging.error(e);
                 logError(new ParseException(e.getMessage())); // allow e to be garbage collected, it links to the entire token stream
             }
-            if (metadataOnly) {
-                return;
+
+            if (!metadataOnly) {
+                // optimization: filter rules for different primitive types
+                ruleIndex.buildIndex(rules.stream());
+                loaded = true;
             }
-            // optimization: filter rules for different primitive types
-            ruleIndex.buildIndex(rules.stream());
-            loaded = true;
+            Logging.debug(stopwatch.toString("Parsing map style " + url));
         } finally {
             STYLE_SOURCE_LOCK.writeLock().unlock();
         }

scripts/TagInfoExtract.java

@@ -354 +354 @@
                 MapCSSParser parser = new MapCSSParser(reader, MapCSSParser.LexicalState.DEFAULT);
                 styleSource = new MapCSSStyleSource("");
                 styleSource.url = "";
-                parser.sheet(styleSource);
+                parser.sheet(styleSource, false);
             }
         }