Sync function

Author: shuzijun

.github/workflows/release.yml

@@ -17,42 +17,45 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v2
-    
+
     - name: Set LD_VERSION
       if: ${{ github.event_name == 'push'}}
       run: echo "LD_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
     - name: Set LD_VERSION
       if: ${{ github.event_name == 'workflow_dispatch'}}
       run: echo "LD_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
-    
+    - name: Set PUBLISH_TOKEN
+      run: echo "PUBLISH_TOKEN=${{ secrets.PUBLISH_TOKEN }}" >> $GITHUB_ENV
+
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    
+
     - name: Build the plugin
-      run: ./gradlew buildPlugin
+      run:  ./gradlew publishPlugin
       env:
-        LD_VERSION: ${{ env.LD_VERSION }} 
-    
-    - name: Verify plugin
-      id: verify
-      uses: ChrisCarini/[email protected]
-      with:
-        failure-levels: |
-          INVALID_PLUGIN
-        ide-versions: |
-          ideaIC:2021.1
-          ideaIC:LATEST-EAP-SNAPSHOT
-    
-    - name: Print verify contents
-      run: |
-        echo "The log file path is: ${{steps.verify.outputs.verification-output-log-filename}}" ;
-        cat ${{steps.verify.outputs.verification-output-log-filename}}
-    
+        LD_VERSION: ${{ env.LD_VERSION }}
+        PUBLISH_TOKEN: ${{ env.PUBLISH_TOKEN }}
+
+        #     - name: Verify plugin
+        #       id: verify
+        #       uses: ChrisCarini/[email protected]
+        #       with:
+        #         failure-levels: |
+        #           INVALID_PLUGIN
+        #         ide-versions: |
+        #           ideaIC:2020.3
+        #           ideaIC:LATEST-EAP-SNAPSHOT
+
+        #     - name: Print verify contents
+        #       run: |
+        #         echo "The log file path is: ${{steps.verify.outputs.verification-output-log-filename}}" ;
+        #         cat ${{steps.verify.outputs.verification-output-log-filename}}
+
     - name: Create Release
       id: create_release
       uses: actions/create-release@v1
@@ -63,14 +66,14 @@ jobs:
         release_name: v${{ env.LD_VERSION }}
         draft: true
         prerelease: false
-    
+
     - name: Upload Release Asset
-      id: upload-release-asset 
+      id: upload-release-asset
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
         asset_path: ./build/distributions/leetcode-editor-${{ env.LD_VERSION }}.zip
         asset_name: leetcode-editor-${{ env.LD_VERSION }}.zip
-        asset_content_type: application/zip      
+        asset_content_type: application/zip

CHANGELOG.md

@@ -0,0 +1,27 @@
+<!-- Keep a Changelog guide -> https://keepachangelog.com -->
+
+# Leetcode Editor Changelog
+
+## 8.2.0
+
+### Added
+- 增加了不同的窗口,包括*分页窗口*、*全部题目窗口*、*[CodeTop](https://codetop.cc/?utm_source=leetcode_editor)窗口*,可以在导航栏中通过按钮切换.
+- Added different windows, including paging window, all problem window, [CodeTop](https://codetop.cc/?utm_source=leetcode_editor) window, which can be switched by buttons in the navigation bar.
+
+- 增加数据统计信息存储,可配合[action](https://github.com/shuzijun/leetcode-editor/blob/master/action/README_ZH.md)生成勋章
+- Increase the storage of data statistics, you can use [action](https://github.com/shuzijun/leetcode-editor/tree/master/action) to generate medals
+
+
+### Changed
+- 修改消息通知方式
+- Modify the message notification method
+
+- 更改窗口位置
+- Change window position
+### Deprecated
+
+### Fixed
+- fix bugs
+
+### Removed
+

build.gradle

@@ -1,15 +1,19 @@
 plugins {
     id 'java-library'
-    id 'org.jetbrains.intellij' version '1.0'
+    id 'org.jetbrains.intellij' version '1.7.0-SNAPSHOT'
+    id 'org.jetbrains.changelog' version "1.3.1"
     id "de.undercouch.download" version "4.0.2"
 }
 
-group 'com.shuzijun.leetcode'
-version (System.getenv('LD_VERSION')==null ? project.plugin_version :System.getenv('LD_VERSION')) + (project.build_env.isEmpty() ? "" : "-") + project.build_env
+apply plugin: 'org.jetbrains.changelog'
+
+group project.pluginGroup
+version (System.getenv('LD_VERSION')==null ? project.pluginVersion :System.getenv('LD_VERSION'))
 
 sourceCompatibility = 11
 targetCompatibility = 11
 
+
 repositories {
     mavenCentral()
 }
@@ -31,47 +35,37 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    pluginName = 'leetcode-editor'
-    version = project.intellij_version
-    type = 'IU'
+    pluginName = project.pluginName
+    version = project.platformVersion
+    type = project.platformType
     downloadSources = true
     updateSinceUntilBuild = false
     buildSearchableOptions.enabled = false
     ideaDependencyCachePath = "$gradle.gradleUserHomeDir/caches/modules-2/files-2.1/com.jetbrains.intellij.idea"
-    /* localPath project.idea_local_path
-     alternativeIdePath project.idea_local_path*/
-    /*plugins = project.intellij_plugins.split(",").toList()*/
+
     runIde {
-        jvmArgs = ["-Dfile.encoding=utf-8"]
+        jvmArgs = project.runIdeJvmArgs.split(',').toList()
     }
-/*    prepareSandbox  {
-        from("src/main/natives" + (project.build_env.isEmpty() ? "" : "-") + project.build_env) { into(getPluginName() + '/natives') }
-    }*/
-
-}
-
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
 
+    patchPluginXml {
+        sinceBuild = project.pluginSinceBuild
+        untilBuild = project.pluginUntilBuild
+        changeNotes.set(provider { changelog.get(project.version+".0").toHTML() })
+    }
 
+    publishPlugin {
+        dependsOn("patchChangelog")
+        token = System.getenv("PUBLISH_TOKEN")
+    }
 
+}
 
+changelog {
 
-/*
-task downloadJCEF(type: Copy) {
-    if (project.build_env.isEmpty()) {
-        return
-    }
-    def tempFile = new File(buildDir, "/download/natives-" + project.build_env + ".zip")
-    download {
-       src("https://github.com/shuzijun/leetcode-editor/releases/download/" + project.jcef_version + "/natives-" + project.build_env + ".zip")
-       dest tempFile
-    }
+}
 
-    from zipTree(tempFile)
-    into "src/main/"
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
 }
-*/
 
 

doc/2020.jpg

@@ -1,7 +1,12 @@
-plugin_version = 8.1
-idea_local_path =
-# '' | windows | mac | linux
-build_env =
-jcef_version = v6.0-jcef-beta.1
-intellij_version = 2021.1
-intellij_plugins = org.intellij.plugins.markdown:211.6693.44
+pluginGroup = com.shuzijun.leetcode
+pluginName = leetcode-editor
+pluginVersion = 8.2
+
+pluginSinceBuild = 202.0
+pluginUntilBuild =
+
+platformType = IU
+platformVersion = 222-EAP-SNAPSHOT
+
+# ,-Dide.browser.jcef.log.level=verbose,-Duser.language=en-US
+runIdeJvmArgs = -Dfile.encoding=utf-8,-Duser.language=en-US

doc/LeetCodeIcon.png

@@ -1,4 +1,11 @@
-rootProject.name = 'leetcode-editor'
-
+pluginManagement  {
+    repositories {
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
+        gradlePluginPortal()
+    }
+}
 
+rootProject.name = 'leetcode-editor'
 

doc/clear.png

@@ -9,10 +9,7 @@
 import com.shuzijun.leetcode.plugin.model.Config;
 import com.shuzijun.leetcode.plugin.model.PluginConstant;
 import com.shuzijun.leetcode.plugin.setting.PersistentConfig;
-import com.shuzijun.leetcode.plugin.utils.MTAUtils;
-import com.shuzijun.leetcode.plugin.utils.MessageUtils;
-import com.shuzijun.leetcode.plugin.utils.PropertiesUtils;
-import com.shuzijun.leetcode.plugin.utils.UpdateUtils;
+import com.shuzijun.leetcode.plugin.utils.*;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 

doc/collapseAll.png

@@ -1,14 +1,20 @@
 package com.shuzijun.leetcode.plugin.actions.editor;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.fileEditor.TextEditorWithPreview;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import com.shuzijun.leetcode.plugin.actions.AbstractAction;
-import com.shuzijun.leetcode.plugin.manager.ViewManager;
+import com.shuzijun.leetcode.plugin.editor.ConvergePreview;
+import com.shuzijun.leetcode.plugin.editor.QuestionEditorWithPreview;
+import com.shuzijun.leetcode.plugin.manager.QuestionManager;
 import com.shuzijun.leetcode.plugin.model.Config;
 import com.shuzijun.leetcode.plugin.model.LeetcodeEditor;
 import com.shuzijun.leetcode.plugin.model.Question;
+import com.shuzijun.leetcode.plugin.setting.PersistentConfig;
 import com.shuzijun.leetcode.plugin.setting.ProjectConfig;
 import com.shuzijun.leetcode.plugin.utils.MessageUtils;
 import com.shuzijun.leetcode.plugin.utils.PropertiesUtils;
@@ -34,11 +40,11 @@ public void actionPerformed(AnActionEvent anActionEvent, Config config) {
             MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.null"));
             return;
         }
-        if(!URLUtils.equalsHost(leetcodeEditor.getHost())){
+        if (!URLUtils.equalsHost(leetcodeEditor.getHost())) {
             MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.host"));
             return;
         }
-        Question question = ViewManager.getQuestionByTitleSlug(leetcodeEditor.getTitleSlug(), null, anActionEvent.getProject());
+        Question question = QuestionManager.getQuestionByTitleSlug(leetcodeEditor.getTitleSlug(), anActionEvent.getProject());
         if (question == null) {
             MessageUtils.getInstance(anActionEvent.getProject()).showInfoMsg("info", PropertiesUtils.getInfo("tree.null"));
             return;
@@ -50,4 +56,23 @@ public void actionPerformed(AnActionEvent anActionEvent, Config config) {
     }
 
     public abstract void actionPerformed(AnActionEvent anActionEvent, Config config, Question question);
+
+    protected boolean openConvergeEditor(AnActionEvent anActionEvent, ConvergePreview.TabSelectFileEditorState state) {
+        FileEditor fileEditor = FileEditorManager.getInstance(anActionEvent.getProject()).getSelectedEditor();
+        if (fileEditor != null && fileEditor instanceof QuestionEditorWithPreview) {
+            QuestionEditorWithPreview questionEditorWithPreview = (QuestionEditorWithPreview) fileEditor;
+            FileEditor previewEditor = questionEditorWithPreview.getPreviewEditor();
+            if (previewEditor instanceof ConvergePreview) {
+                ConvergePreview convergePreview = (ConvergePreview) previewEditor;
+                ApplicationManager.getApplication().invokeLater(() -> {
+                    convergePreview.setState(state);
+                    if ((questionEditorWithPreview.getLayout() == TextEditorWithPreview.Layout.SHOW_PREVIEW && PersistentConfig.getInstance().getInitConfig().isLeftQuestionEditor()) || (questionEditorWithPreview.getLayout() == TextEditorWithPreview.Layout.SHOW_EDITOR && !PersistentConfig.getInstance().getInitConfig().isLeftQuestionEditor())) {
+                        questionEditorWithPreview.setState(new TextEditorWithPreview.MyFileEditorState(TextEditorWithPreview.Layout.SHOW_EDITOR_AND_PREVIEW, null, null));
+                    }
+                });
+                return true;
+            }
+        }
+        return false;
+    }
 }

doc/config-3.0.png

@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
+import com.shuzijun.leetcode.plugin.editor.ConvergePreview;
 import com.shuzijun.leetcode.plugin.manager.CodeManager;
 import com.shuzijun.leetcode.plugin.model.Config;
 import com.shuzijun.leetcode.plugin.model.Question;
@@ -13,8 +14,11 @@ public class OpenContentAction extends AbstractEditAction {
 
     @Override
     public void actionPerformed(AnActionEvent anActionEvent, Config config, Question question) {
+        if (config.getConvergeEditor() && openConvergeEditor(anActionEvent, new ConvergePreview.TabSelectFileEditorState("Content"))) {
+            return;
+        }
         Project project = anActionEvent.getProject();
-        CodeManager.openContent(question, project, true);
+        CodeManager.openContent(question.getTitleSlug(), project, true);
 
     }
 }