Merge pull request #261 from SeeSharpSoft/fb_deprecated_function_cleanup

SeeSharpSoft · web-flow · commit 73cf0eba859f · 2021-03-23T20:22:28.000+01:00
[INTERNAL] no usage of deprecated methods from idea/intellij
diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,10 @@ plugins {
     id "com.github.ManifestClasspath" version "0.1.0-RELEASE"
 }
 
+jacoco {
+    toolVersion = "0.8.6"
+}
+
 jacocoTestReport {
     reports {
         xml.enabled true
@@ -29,7 +33,10 @@ version '2.14.4'
 apply plugin: 'java'
 project.sourceCompatibility = JavaVersion.VERSION_11
 project.targetCompatibility = JavaVersion.VERSION_11
-tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << "-Xlint:deprecation"
+}
 repositories {
     mavenCentral()
 }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvFileTypeFactory.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvFileTypeFactory.java
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvIconProvider.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvIconProvider.java
@@ -12,11 +12,11 @@
 
 public class CsvIconProvider extends IconProvider {
 
-    public static final Icon FILE = IconLoader.getIcon("/media/icons/csv-icon.png");
+    public static final Icon FILE = IconLoader.getIcon("/media/icons/csv-icon.png", CsvIconProvider.class);
 
-    public static final Icon HEADER = IconLoader.getIcon("/media/icons/csv-header-icon.png");
+    public static final Icon HEADER = IconLoader.getIcon("/media/icons/csv-header-icon.png", CsvIconProvider.class);
 
-    public static final Icon FIELD = IconLoader.getIcon("/media/icons/csv-field-icon.png");
+    public static final Icon FIELD = IconLoader.getIcon("/media/icons/csv-field-icon.png", CsvIconProvider.class);
 
     @Nullable
     @Override
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvParserDefinition.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvParserDefinition.java
@@ -62,11 +62,6 @@ public PsiFile createFile(FileViewProvider viewProvider) {
         return new CsvFile(viewProvider, CsvFileType.INSTANCE);
     }
 
-    @Override
-    public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
-        return SpaceRequirements.MAY;
-    }
-
     @Override
     @NotNull
     public PsiElement createElement(ASTNode node) {
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvPlugin.java
@@ -3,6 +3,7 @@
 import com.intellij.ide.actions.ShowSettingsUtilImpl;
 import com.intellij.ide.plugins.IdeaPluginDescriptorImpl;
 import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.notification.*;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.options.ShowSettingsUtil;
@@ -20,7 +21,7 @@
 public class CsvPlugin implements StartupActivity {
 
     protected static IdeaPluginDescriptorImpl getPluginDescriptor() {
-        return (IdeaPluginDescriptorImpl)PluginManager.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
+        return (IdeaPluginDescriptorImpl)PluginManagerCore.getPlugin(PluginId.getId("net.seesharpsoft.intellij.plugins.csv"));
     }
 
     protected static String getVersion() {
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/CsvAnnotator.java
@@ -65,7 +65,14 @@ public void annotate(@NotNull final PsiElement element, @NotNull final Annotatio
                 textRange = TextRange.from(textRange.getStartOffset() - 1, 1);
             }
 
-            Annotation annotation = holder.createAnnotation(CSV_COLUMN_INFO_SEVERITY, textRange, message, tooltip);
+            final Annotation annotation =
+                    new Annotation(
+                            textRange.getStartOffset(),
+                            textRange.getEndOffset(),
+                            CSV_COLUMN_INFO_SEVERITY,
+                            message,
+                            tooltip
+                    );
             annotation.setEnforcedTextAttributes(
                     CsvEditorSettings.getInstance().getValueColoring() == CsvEditorSettings.ValueColoring.RAINBOW ?
                             CsvColorSettings.getTextAttributesOfColumn(columnInfo.getColumnIndex(), holder.getCurrentAnnotationSession()) :
@@ -98,11 +105,15 @@ protected boolean handleSeparatorElement(@NotNull PsiElement element, @NotNull A
                 }
             }
             if (textAttributes != null) {
-                Annotation annotation = holder.createAnnotation(
-                        CSV_COLUMN_INFO_SEVERITY,
-                        element.getTextRange(),
-                        showInfoBalloon(holder.getCurrentAnnotationSession()) ? "↹" : null
-                );
+                final TextRange textRange = element.getTextRange();
+                final Annotation annotation =
+                        new Annotation(
+                                textRange.getStartOffset(),
+                                textRange.getEndOffset(),
+                                CSV_COLUMN_INFO_SEVERITY,
+                                showInfoBalloon(holder.getCurrentAnnotationSession()) ? "↹" : null,
+                                null
+                        );
                 annotation.setEnforcedTextAttributes(textAttributes);
                 annotation.setNeedsUpdateOnTyping(false);
             }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableEditor.java
@@ -144,7 +144,7 @@ public void saveChanges(final String content) {
         }
         ApplicationManager.getApplication().invokeLater(() -> {
             if (project == null || project.isDisposed() ||
-                    (!this.document.isWritable() && ReadonlyStatusHandler.getInstance(this.project).ensureFilesWritable(this.file).hasReadonlyFiles())) {
+                    (!this.document.isWritable() && ReadonlyStatusHandler.getInstance(this.project).ensureFilesWritable(Collections.singleton(this.file)).hasReadonlyFiles())) {
                 return;
             }
             ApplicationManager.getApplication().runWriteAction(() ->
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/MultiLineCellRenderer.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/MultiLineCellRenderer.java
@@ -20,6 +20,7 @@
 import javax.swing.text.BadLocationException;
 import java.awt.*;
 import java.awt.event.FocusEvent;
+import java.awt.geom.Rectangle2D;
 import java.util.EventObject;
 import java.util.Iterator;
 import java.util.Set;
@@ -96,10 +97,10 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
     @Override
     public Dimension getPreferredSize() {
         try {
-            final Rectangle rectangle = myTextArea.modelToView(myTextArea.getDocument().getLength());
+            final Rectangle2D rectangle = myTextArea.modelToView2D(myTextArea.getDocument().getLength());
             if (rectangle != null) {
                 return new Dimension(this.getWidth(),
-                        this.getInsets().top + rectangle.y + rectangle.height + this.getInsets().bottom);
+                        (int)(this.getInsets().top + rectangle.getY() + rectangle.getHeight() + this.getInsets().bottom));
             }
         } catch (BadLocationException e) {
             e.printStackTrace();
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvCodeStyleSettingsProvider.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvCodeStyleSettingsProvider.java
@@ -25,7 +25,7 @@ public String getConfigurableDisplayName() {
 
     @NotNull
     @Override
-    public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) {
+    public CodeStyleConfigurable createConfigurable(CodeStyleSettings settings, CodeStyleSettings originalSettings) {
         return new CodeStyleAbstractConfigurable(settings, originalSettings, CsvLanguage.INSTANCE.getDisplayName()) {
             @Override
             protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) {
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvLanguageCodeStyleSettingsProvider.java b/src/main/java/net/seesharpsoft/intellij/plugins/csv/settings/CsvLanguageCodeStyleSettingsProvider.java
@@ -77,18 +77,15 @@ public String getCodeSample(@NotNull SettingsType settingsType) {
                 "5 ,Holmes HEPA Air Purifier,Carlos Soltero,汉字宋,30.94,21.78";
     }
 
-    @Override
-    public CommonCodeStyleSettings getDefaultCommonSettings() {
-        CommonCodeStyleSettings commonSettings = new CommonCodeStyleSettings(getLanguage());
-        commonSettings.initIndentOptions();
-        commonSettings.getIndentOptions().TAB_SIZE = 1;
-        commonSettings.getIndentOptions().INDENT_SIZE = 1;
-        commonSettings.getIndentOptions().USE_TAB_CHARACTER = true;
-        commonSettings.getIndentOptions().SMART_TABS = false;
-        commonSettings.getIndentOptions().KEEP_INDENTS_ON_EMPTY_LINES = true;
+    protected void customizeDefaults(@NotNull CommonCodeStyleSettings commonSettings, @NotNull CommonCodeStyleSettings.IndentOptions indentOptions) {
+        super.customizeDefaults(commonSettings, indentOptions);
+        indentOptions.TAB_SIZE = 1;
+        indentOptions.INDENT_SIZE = 1;
+        indentOptions.USE_TAB_CHARACTER = true;
+        indentOptions.SMART_TABS = false;
+        indentOptions.KEEP_INDENTS_ON_EMPTY_LINES = true;
         commonSettings.WRAP_ON_TYPING = CommonCodeStyleSettings.WrapOnTyping.NO_WRAP.intValue;
         commonSettings.WRAP_LONG_LINES = false;
         commonSettings.RIGHT_MARGIN = Integer.MAX_VALUE;
-        return commonSettings;
     }
 }
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvFileTypeFactory.java b/src/main/java/net/seesharpsoft/intellij/plugins/psv/PsvFileTypeFactory.java
diff --git a/src/main/java/net/seesharpsoft/intellij/plugins/tsv/TsvFileTypeFactory.java b/src/main/java/net/seesharpsoft/intellij/plugins/tsv/TsvFileTypeFactory.java
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -56,23 +56,13 @@ NEW: Auto detect value separator (by count)
     </change-notes>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-<!--    <idea-version since-build="173.2099.1" until-build="192.*" />-->
-    <idea-version since-build="193" />
+    <idea-version since-build="193.5233.102" />
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
     <depends>com.intellij.modules.lang</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <!-- version 173.* - 192.* -->
-<!--        <fileType name="FileType_CSV" implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvFileType" extensions="csv"/>-->
-<!--        <fileType name="FileType_TSV" implementationClass="net.seesharpsoft.intellij.plugins.tsv.TsvFileType" extensions="tsv;tab"/>-->
-<!--        <fileType name="FileType_PSV" implementationClass="net.seesharpsoft.intellij.plugins.psv.PsvFileType" extensions="psv"/>-->
-<!--        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.csv.CsvFileTypeFactory"/>-->
-<!--        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.tsv.TsvFileTypeFactory"/>-->
-<!--        <fileTypeFactory implementation="net.seesharpsoft.intellij.plugins.psv.PsvFileTypeFactory"/>-->
-
-        <!-- version 193.* -->
         <fileType name="CSV" language="csv" implementationClass="net.seesharpsoft.intellij.plugins.csv.CsvFileType" extensions="csv" fieldName="INSTANCE"/>
         <fileType name="TSV" language="tsv" implementationClass="net.seesharpsoft.intellij.plugins.tsv.TsvFileType" extensions="tsv;tab" fieldName="INSTANCE"/>
         <fileType name="PSV" language="psv" implementationClass="net.seesharpsoft.intellij.plugins.psv.PsvFileType" extensions="psv" fieldName="INSTANCE"/>

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public void saveChanges(final String content) {`
`144`	`144`	`}`
`145`	`145`	`ApplicationManager.getApplication().invokeLater(() -> {`
`146`	`146`	`if (project == null \|\| project.isDisposed() \|\|`
`147`		`- (!this.document.isWritable() && ReadonlyStatusHandler.getInstance(this.project).ensureFilesWritable(this.file).hasReadonlyFiles())) {`
	`147`	`+ (!this.document.isWritable() && ReadonlyStatusHandler.getInstance(this.project).ensureFilesWritable(Collections.singleton(this.file)).hasReadonlyFiles())) {`
`148`	`148`	`return;`
`149`	`149`	`}`
`150`	`150`	`ApplicationManager.getApplication().runWriteAction(() ->`