Merge pull request #163 from ZenUml/fixing-preview-static-server-casting-error

Fixing preview static server casting error

Author: MrCoder

build.gradle

@@ -2,7 +2,7 @@ plugins {
   id 'java'
   id 'idea'
   id 'org.jetbrains.intellij' version '0.4.21'
-  id 'org.jetbrains.kotlin.jvm' version '1.3.21'
+  id 'org.jetbrains.kotlin.jvm' version '1.4.21'
 }
 
 repositories {
@@ -15,8 +15,8 @@ dependencies {
   // https://mvnrepository.com/artifact/com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer
   compile group: 'com.googlecode.owasp-java-html-sanitizer', name: 'owasp-java-html-sanitizer'
   compile "org.jetbrains:markdown:${markdownParserVersion}"
-  compile "org.jetbrains.kotlin:kotlin-reflect:1.3.21"
-  compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.21"
+  compile "org.jetbrains.kotlin:kotlin-reflect:1.4.21"
+  compile "org.jetbrains.kotlin:kotlin-stdlib:1.4.21"
   compile "io.reactivex.rxjava2:rxjava:2.2.9"
 
   testCompile group: 'junit', name: 'junit', version: '4.12'
@@ -27,7 +27,7 @@ targetCompatibility = javaVersion
 
 compileKotlin {
   kotlinOptions.jvmTarget = javaVersion
-  kotlinOptions.apiVersion = "1.3"
+  kotlinOptions.apiVersion = "1.4"
 }
 compileTestKotlin {
   kotlinOptions.jvmTarget = javaVersion
@@ -54,11 +54,11 @@ sourceSets {
 }
 
 intellij {
-  version 'IC-2020.2'
+  version 'IC-2020.3.2'
   pluginName 'zenuml'
   downloadSources false
   updateSinceUntilBuild false
-  plugins = ['IntelliLang', 'java', 'com.intellij.javafx:1.0.2']
+  plugins = ['IntelliLang', 'java']
 }
 
 //buildSearchableOptions {

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,13 +1,12 @@
 <idea-plugin>
   <id>com.zenuml.jetbrains</id>
   <name>ZenUML support</name>
-  <version>2020.2</version>
+  <version>2021.3</version>
   <idea-version since-build="202.6397.94"/>
   <vendor url="http://www.zenuml.com">ZenUML</vendor>
 
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.java</depends>
-  <depends>com.intellij.javafx</depends>
   <depends optional="true" config-file="plugin-intelliLang.xml">org.intellij.intelliLang</depends>
 
   <description><![CDATA[
@@ -66,7 +65,8 @@ Includes the following features:</p>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <fileTypeFactory implementation="org.intellij.plugins.markdown.lang.MarkdownFileTypeFactory"/>
+    <fileType name="ZenUML" extensions="z;zen;zenuml" language="ZenUML"
+              implementationClass="org.intellij.plugins.markdown.lang.ZenUmlFileType" fieldName="INSTANCE"/>
     <lang.parserDefinition language="ZenUML" implementationClass="org.intellij.plugins.markdown.lang.parser.MarkdownParserDefinition"/>
     <lang.ast.factory language="ZenUML" implementationClass="org.intellij.plugins.markdown.lang.psi.MarkdownASTFactory"/>
 
@@ -111,7 +111,7 @@ Includes the following features:</p>
                                   implementationClass="org.intellij.plugins.markdown.structureView.MarkdownStructureViewFactory"/>
     <psi.referenceContributor implementation="org.intellij.plugins.markdown.lang.references.MarkdownReferenceProvider"/>
     <stripTrailingSpacesFilterFactory implementation="org.intellij.plugins.markdown.editor.MarkdownStripTrailingSpacesFilterFactory"/>
-    <httpRequestHandler implementation="org.intellij.plugins.markdown.ui.preview.PreviewStaticServer"/>
+    <httpRequestHandler implementation="org.intellij.plugins.markdown.ui.preview.PreviewStaticServer2"/>
 
     <localInspection shortName="ZenUmlUnresolvedFileReference" bundle="org.intellij.plugins.markdown.bundle.MarkdownBundle"
                      key="zenuml.placeholder.inspection.name" groupKey="zenuml.inspection.group.ruby.name"

gradlew

@@ -20,14 +20,14 @@
 import com.intellij.lang.PairedBraceMatcher;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.tree.IElementType;
-import org.intellij.plugins.markdown.lang.MarkdownLanguage;
+import org.intellij.plugins.markdown.lang.ZenUmlLanguage;
 import org.intellij.plugins.markdown.lang.MarkdownTokenTypes;
 import org.jetbrains.annotations.NotNull;
 
 public class MarkdownBraceMatcher extends PairedBraceMatcherAdapter {
 
   public MarkdownBraceMatcher() {
-    super(new MyPairedBraceMatcher(), MarkdownLanguage.INSTANCE);
+    super(new MyPairedBraceMatcher(), ZenUmlLanguage.INSTANCE);
   }
 
   private static class MyPairedBraceMatcher implements PairedBraceMatcher {

resource/META-INF/plugin.xml

@@ -21,7 +21,7 @@
 import com.intellij.openapi.editor.StripTrailingSpacesFilterFactory;
 import com.intellij.openapi.editor.impl.PsiBasedStripTrailingSpacesFilter;
 import com.intellij.openapi.project.Project;
-import org.intellij.plugins.markdown.lang.MarkdownLanguage;
+import org.intellij.plugins.markdown.lang.ZenUmlLanguage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,7 +31,7 @@ public class MarkdownStripTrailingSpacesFilterFactory extends StripTrailingSpace
   @Override
   public StripTrailingSpacesFilter createFilter(@Nullable Project project, @NotNull Document document) {
     Language documentLanguage = PsiBasedStripTrailingSpacesFilter.getDocumentLanguage(document);
-    if (documentLanguage != null && documentLanguage.is(MarkdownLanguage.INSTANCE)) {
+    if (documentLanguage != null && documentLanguage.is(ZenUmlLanguage.INSTANCE)) {
       return StripTrailingSpacesFilter.NOT_ALLOWED;
     }
     return StripTrailingSpacesFilter.ALL_LINES;

src/org/intellij/plugins/markdown/braces/MarkdownBraceMatcher.java

@@ -39,7 +39,7 @@ public class MarkdownElementType extends IElementType {
     new HashMap<>();
 
   public MarkdownElementType(@NotNull @NonNls String debugName) {
-    super(debugName, MarkdownLanguage.INSTANCE);
+    super(debugName, ZenUmlLanguage.INSTANCE);
   }
 
   @Override

src/org/intellij/plugins/markdown/editor/MarkdownStripTrailingSpacesFilterFactory.java

@@ -24,7 +24,7 @@
 import static org.intellij.plugins.markdown.lang.MarkdownElementType.platformType;
 
 public interface MarkdownElementTypes {
-  IFileElementType MARKDOWN_FILE_ELEMENT_TYPE = new IStubFileElementType("Markdown file", MarkdownLanguage.INSTANCE);
+  IFileElementType MARKDOWN_FILE_ELEMENT_TYPE = new IStubFileElementType("ZenUML file", ZenUmlLanguage.INSTANCE);
 
   IElementType MARKDOWN_FILE = platformType(org.intellij.markdown.MarkdownElementTypes.MARKDOWN_FILE);
 

src/org/intellij/plugins/markdown/lang/MarkdownElementType.java

@@ -22,6 +22,6 @@
 public class MarkdownFileTypeFactory extends FileTypeFactory {
   @Override
   public void createFileTypes(@NotNull FileTypeConsumer consumer) {
-    consumer.consume(MarkdownFileType.INSTANCE, "z;zen;zenuml");
+    consumer.consume(ZenUmlFileType.INSTANCE, "z;zen;zenuml");
   }
 }