Merge pull request #21 from zephir-lang/fix/updated-api

Replaced usage of deprecated API by new one
zephir-lang · May 12, 2020 · 56c39c2 · 56c39c2
2 parents 67dd2b0 + 9dbd9bb
commit 56c39c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 28 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin url="https://github.com/zephir-lang/idea-plugin">
   <id>com.zephir</id>
   <name>Zephir</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <vendor email="[email protected]" url="https://zephir-lang.com">Zephir Team</vendor>
 
   <description><![CDATA[
@@ -28,6 +28,7 @@
   <change-notes><![CDATA[
     <html lang="en">
       <ul>
+        <li><b>0.3.4</b>: Replaced usage of deprecated API by new one</li>
         <li><b>0.3.3</b>: Fixed recognizing strings with regular expressions</li>
         <li><b>0.3.2</b>: Completion list now shows members of class. Improved syntax support</li>
         <li><b>0.3.1</b>: Fixed much bugs with syntax recognition, fixed extra space in completion for method params</li>
@@ -48,7 +49,11 @@
   <depends>com.intellij.modules.lang</depends>
 
   <extensions defaultExtensionNs="com.intellij">
-    <fileTypeFactory implementation="com.zephir.ZephirFileTypeFactory"/>
+    <fileType name="Zephir"
+              language="Zephir"
+              implementationClass="com.zephir.ZephirFileType"
+              fieldName="INSTANCE"
+              extensions="zep"/>
 
     <lang.parserDefinition language="Zephir" implementationClass="com.zephir.ZephirParserDefinition"/>
     <lang.commenter language="Zephir" implementationClass="com.zephir.lang.ZephirCommenter"/>

diff --git a/src/com/zephir/ZephirFileTypeFactory.java b/src/com/zephir/ZephirFileTypeFactory.java
diff --git a/src/com/zephir/ZephirParserDefinition.java b/src/com/zephir/ZephirParserDefinition.java
@@ -76,9 +76,4 @@ public PsiElement createElement(ASTNode node) {
     public PsiFile createFile(FileViewProvider provider) {
         return new ZephirFile(provider);
     }
-
-    @Override
-    public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode astNode, ASTNode astNode2) {
-        return SpaceRequirements.MAY;
-    }
 }
diff --git a/src/com/zephir/actions/ZephirNewClassAction.java b/src/com/zephir/actions/ZephirNewClassAction.java
@@ -38,7 +38,7 @@ protected String getActionName(PsiDirectory directory, String name, String templ
 
     @Override
     protected PsiFile createFile(String name, String templateName, PsiDirectory dir) {
-        final FileTemplate template = FileTemplateManager.getInstance().getInternalTemplate(templateName);
+        final FileTemplate template = FileTemplateManager.getInstance(dir.getProject()).getInternalTemplate(templateName);
         return createFileFromTemplate(name, template, dir);
     }
 }