wangtao
/
EasyCode
mirror of https://gitee.com/makejava/EasyCode.git
1
0
Fork 2
Code Issues Releases Wiki Activity

修复针对20.1版本打开模板编辑框报错问题

This commit is contained in:
makejava 2020-06-11 17:06:00 +08:00
parent b310801997
commit 6ad2ecf06f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sjhy/plugin/actions/MainAction.java
View File

@ -6,6 +6,7 @@ import com.intellij.openapi.project.Project;
import com.sjhy.plugin.service.TableInfoService;
import com.sjhy.plugin.tool.CacheDataUtils;
import com.sjhy.plugin.ui.SelectSavePath;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@ -31,7 +32,7 @@ public class MainAction extends AnAction {
* @param event 事件对象
*/
@Override
public void actionPerformed(AnActionEvent event) {
public void actionPerformed(@NotNull AnActionEvent event) {
Project project = event.getProject();
if (project == null) {
return;

16
src/main/java/com/sjhy/plugin/ui/base/TemplateEditor.java
View File

@ -11,16 +11,15 @@ import com.intellij.openapi.editor.event.DocumentEvent;
import com.intellij.openapi.editor.event.DocumentListener;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Splitter;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiFileFactory;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.ui.BrowserHyperlinkListener;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.SeparatorFactory;
import com.intellij.util.LocalTimeCounter;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import lombok.Getter;
@ -107,12 +106,13 @@ public class TemplateEditor {
if (editor != null) {
editorFactory.releaseEditor(editor);
}
PsiFileFactory psiFileFactory = PsiFileFactory.getInstance(project);
PsiFile psiFile = psiFileFactory.createFileFromText(EASY_CODE_TEMPLATE, fileType, content, 0, true);
LightVirtualFile virtualFile = new LightVirtualFile(EASY_CODE_TEMPLATE, fileType, content, LocalTimeCounter.currentTime());
// 标识为模板，让velocity跳过语法校验
psiFile.getViewProvider().putUserData(FileTemplateManager.DEFAULT_TEMPLATE_PROPERTIES, FileTemplateManager.getInstance(project).getDefaultProperties());
virtualFile.putUserData(FileTemplateManager.DEFAULT_TEMPLATE_PROPERTIES, FileTemplateManager.getInstance(project).getDefaultProperties());
// 创建文档对象
Document document = PsiDocumentManager.getInstance(project).getDocument(psiFile);
Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
assert document != null;
// 创建编辑框
editor = editorFactory.createEditor(document, project);
@ -120,7 +120,7 @@ public class TemplateEditor {
// 添加修改事件
editor.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void documentChanged(DocumentEvent event) {
public void documentChanged(@NotNull DocumentEvent event) {
String text = editor.getDocument().getText();
// 回调事件
if (callback != null && !Objects.equals(text, content)) {