[GitHub] geertjanw closed pull request #620: #268649-NPE at JsStructureScanner.folds while opening .js file

[GitBox <gi...@apache.org>]

geertjanw closed pull request #620: #268649-NPE at JsStructureScanner.folds while opening .js file
URL: https://github.com/apache/incubator-netbeans/pull/620
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/lexer.nbbridge/nbproject/project.properties b/lexer.nbbridge/nbproject/project.properties
index 911cf716f5..40c44bdf15 100644
--- a/lexer.nbbridge/nbproject/project.properties
+++ b/lexer.nbbridge/nbproject/project.properties
@@ -16,6 +16,6 @@
 # under the License.
 is.eager=true
 javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
+javac.source=1.8
 javadoc.arch=${basedir}/arch.xml
 spec.version.base=1.35.0
diff --git a/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupLanguageProvider.java b/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupLanguageProvider.java
index 4698a838c8..d82b1f71cd 100644
--- a/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupLanguageProvider.java
+++ b/lexer.nbbridge/src/org/netbeans/modules/lexer/nbbridge/MimeLookupLanguageProvider.java
@@ -19,6 +19,8 @@
 
 package org.netbeans.modules.lexer.nbbridge;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.netbeans.api.editor.mimelookup.MimeLookup;
 import org.netbeans.api.editor.mimelookup.MimePath;
 import org.netbeans.api.lexer.InputAttributes;
@@ -28,6 +30,8 @@
 import org.netbeans.spi.lexer.LanguageEmbedding;
 import org.netbeans.spi.lexer.LanguageProvider;
 import org.openide.util.Lookup;
+import org.openide.util.LookupEvent;
+import org.openide.util.LookupListener;
 
 /**
  *
@@ -36,18 +40,50 @@
 @org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.lexer.LanguageProvider.class)
 public final class MimeLookupLanguageProvider extends LanguageProvider {
     
+    private final Map<String, Lookup.Result<Language>> langLkpResultsMap = 
+                  new HashMap<>();
+    private final Map<String, Lookup.Result<LanguagesEmbeddingMap>> embeddingsLkpResultsMap = 
+                  new HashMap<>();
+    private final String LOCK = new String("MimeLookupLanguageProvider.LOCK"); //NOI18N
+ 
     public MimeLookupLanguageProvider() {
         super();
     }
 
     public Language<?> findLanguage(String mimeType) {
         Lookup lookup = MimeLookup.getLookup(MimePath.parse(mimeType));
+ 
+        //268649: add lookup listener for Language.class
+        synchronized (LOCK) {
+            Lookup.Result result = langLkpResultsMap.get(mimeType);
+            if (result == null) {
+                result = lookup.lookup(new Lookup.Template(Language.class));
+                result.addLookupListener((LookupEvent evt) -> {
+                    firePropertyChange(PROP_LANGUAGE);
+                });
+                langLkpResultsMap.put(mimeType, result);
+            }
+        } 
         return (Language<?>)lookup.lookup(Language.class);
     }
 
     public LanguageEmbedding<?> findLanguageEmbedding(
     Token<?> token, LanguagePath languagePath, InputAttributes inputAttributes) {
-        Lookup lookup = MimeLookup.getLookup(MimePath.parse(languagePath.mimePath()));
+        String mimePath = languagePath.mimePath();
+        Lookup lookup = MimeLookup.getLookup(MimePath.parse(mimePath));
+        
+        //268649: add lookup listener for LanguagesEmbeddingMap.class            
+        synchronized (LOCK) {
+            Lookup.Result result = embeddingsLkpResultsMap.get(mimePath);
+            if (result == null) {
+                result = lookup.lookup(new Lookup.Template(LanguagesEmbeddingMap.class));
+                result.addLookupListener((LookupEvent evt) -> {
+                    firePropertyChange(PROP_EMBEDDED_LANGUAGE);
+                });
+                embeddingsLkpResultsMap.put(mimePath, result);
+            }
+        }
+
         LanguagesEmbeddingMap map = lookup.lookup(LanguagesEmbeddingMap.class);
         return map == null ? null : map.getLanguageEmbeddingForTokenName(token.id().name());
     }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists