IDEA 14.1 EAP compatibility

JetBrains · Feb 13, 2015 · 2797e3f · 2797e3f
1 parent 37bd034
commit 2797e3f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/support/META-INF/plugin.xml b/support/META-INF/plugin.xml
@@ -1,8 +1,8 @@
 <idea-plugin url="https://github.com/JetBrains/Grammar-Kit" version="2">
   <id>org.jetbrains.idea.grammar</id>
-  <version>1.2.0.2</version>
+  <version>1.2.0.3</version>
   <vendor email="gregory.shrago@jetbrains.com">Greg Shrago</vendor>
-  <idea-version since-build="139.0" until-build=""/>
+  <idea-version since-build="140.2285" until-build=""/>
 
   <name>Grammar-Kit</name>
   <description>BNF Grammars and JFlex lexers editor. Readable parser/PSI code generator.</description>

diff --git a/support/org/intellij/grammar/BnfStructureViewFactory.java b/support/org/intellij/grammar/BnfStructureViewFactory.java
@@ -19,6 +19,7 @@
 import com.intellij.ide.structureView.impl.common.PsiTreeElementBase;
 import com.intellij.ide.util.treeView.smartTree.SortableTreeElement;
 import com.intellij.lang.PsiStructureViewFactory;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
@@ -27,6 +28,7 @@
 import org.intellij.grammar.psi.*;
 import org.intellij.grammar.psi.impl.BnfFileImpl;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -41,7 +43,7 @@ public class BnfStructureViewFactory implements PsiStructureViewFactory {
   public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
     return new TreeBasedStructureViewBuilder() {
       @NotNull
-      public StructureViewModel createStructureViewModel() {
+      public StructureViewModel createStructureViewModel(@Nullable Editor editor) {
         return new MyModel(psiFile);
       }
 

diff --git a/support/org/intellij/grammar/LightPsi.java b/support/org/intellij/grammar/LightPsi.java
@@ -54,7 +54,6 @@
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.openapi.vfs.encoding.EncodingManagerImpl;
-import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiCachedValuesFactory;
 import com.intellij.psi.impl.PsiFileFactoryImpl;
@@ -193,6 +192,7 @@ public static class Init {
     public static void initExtensions(MockProjectEx project, MockPsiManager psiManager) {
       Extensions.getRootArea().registerExtensionPoint("com.intellij.referencesSearch", "com.intellij.util.QueryExecutor");
       Extensions.getRootArea().registerExtensionPoint("com.intellij.useScopeEnlarger", "com.intellij.psi.search.UseScopeEnlarger");
+      Extensions.getRootArea().registerExtensionPoint("com.intellij.useScopeOptimizer", "com.intellij.psi.search.UseScopeOptimizer");
       Extensions.getRootArea().registerExtensionPoint("com.intellij.languageInjector", "com.intellij.psi.LanguageInjector");
       Extensions.getArea(project).registerExtensionPoint("com.intellij.multiHostInjector", "com.intellij.lang.injection.MultiHostInjector");
       Extensions.getRootArea().registerExtensionPoint("com.intellij.codeInsight.containerProvider",
@@ -285,12 +285,6 @@ public FileTypeRegistry get() {
             return FileTypeManager.getInstance();
           }
         },
-        new Getter<EncodingRegistry>() {
-          @Override
-          public EncodingRegistry get() {
-            return EncodingManager.getInstance();
-          }
-        },
         rootDisposable
       );
       instance.registerService(EncodingManager.class, EncodingManagerImpl.class);

diff --git a/support/org/intellij/grammar/livePreview/LivePreviewStructureViewFactory.java b/support/org/intellij/grammar/livePreview/LivePreviewStructureViewFactory.java
@@ -22,6 +22,7 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.PsiStructureViewFactory;
 import com.intellij.navigation.ColoredItemPresentation;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.util.text.StringUtil;
@@ -56,7 +57,7 @@ public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
     return new TreeBasedStructureViewBuilder() {
       @NotNull
       @Override
-      public StructureViewModel createStructureViewModel() {
+      public StructureViewModel createStructureViewModel(@Nullable Editor editor) {
         return new MyModel(psiFile);
       }
 

diff --git a/testData/parser/BnfGrammar.txt b/testData/parser/BnfGrammar.txt
@@ -209,6 +209,12 @@ BnfFile:BnfGrammar.bnf
             BNF_STRING_LITERAL_EXPRESSION: ">>"
               PsiElement(string)('">>"')
           PsiWhiteSpace('\n\n    ')
+          BNF_LIST_ENTRY
+            PsiElement(id)('space')
+            PsiElement(=)('=')
+            BNF_STRING_LITERAL_EXPRESSION: 'regexp:\s+'
+              PsiElement(string)(''regexp:\s+'')
+          PsiWhiteSpace('\n    ')
           BNF_LIST_ENTRY
             PsiElement(id)('id')
             PsiElement(=)('=')