Minor updates for deprecations and general code changes

Author: reedy

src/main/java/org/mediawiki/MediaWikiPhpPredefinedCodeStyle.java

@@ -21,11 +21,14 @@ public void apply(CodeStyleSettings settings) {
         CommonCodeStyleSettings commonSettings = settings.getCommonSettings(getLanguage());
         commonSettings.KEEP_BLANK_LINES_IN_CODE = 1;
         commonSettings.KEEP_BLANK_LINES_BEFORE_RBRACE = 0;
+
+        // Don't keep line breaks when reformatting
         commonSettings.KEEP_LINE_BREAKS = false;
+
         commonSettings.KEEP_CONTROL_STATEMENT_IN_ONE_LINE = false;
 
-        commonSettings.CLASS_BRACE_STYLE = 1;
-        commonSettings.METHOD_BRACE_STYLE = 1;
+        commonSettings.CLASS_BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
+        commonSettings.METHOD_BRACE_STYLE = CommonCodeStyleSettings.END_OF_LINE;
 
         commonSettings.CATCH_ON_NEW_LINE = false;
         commonSettings.FINALLY_ON_NEW_LINE = false;
@@ -43,12 +46,13 @@ public void apply(CodeStyleSettings settings) {
         commonSettings.SPACE_WITHIN_SWITCH_PARENTHESES = true;
         commonSettings.SPACE_WITHIN_ARRAY_INITIALIZER_BRACES = true;
         commonSettings.SPACE_AFTER_TYPE_CAST = false;
+        // Doesn't seem to exist?
         // commonSettings.SPACES_AROUND_VAR_WITHIN_BRACKETS = false;
 
-        commonSettings.IF_BRACE_FORCE = 3;
-        commonSettings.FOR_BRACE_FORCE = 3;
-        commonSettings.DOWHILE_BRACE_FORCE = 3;
-        commonSettings.WHILE_BRACE_FORCE = 3;
+        commonSettings.IF_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
+        commonSettings.FOR_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
+        commonSettings.DOWHILE_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
+        commonSettings.WHILE_BRACE_FORCE = CommonCodeStyleSettings.FORCE_BRACES_ALWAYS;
 
         commonSettings.ARRAY_INITIALIZER_WRAP = 2;
         commonSettings.ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE = true;
@@ -81,9 +85,6 @@ public void apply(CodeStyleSettings settings) {
         // Doesn't seem to exist?
         // commonSettings.SOFT_MARGINS = 100;
 
-        // Don't keep line breaks when reformatting
-        commonSettings.KEEP_LINE_BREAKS = false;
-
         PhpCodeStyleSettings phpSettings = settings.getCustomSettings(PhpCodeStyleSettings.class);
         phpSettings.LOWER_CASE_BOOLEAN_CONST = true;
         phpSettings.LOWER_CASE_NULL_CONST = true;

src/main/java/org/mediawiki/MediaWikiSearchDocsAction.java

@@ -17,6 +17,7 @@
 package org.mediawiki;
 
 import com.intellij.ide.BrowserUtil;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -26,14 +27,14 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * @author Reedy
  */
 public class MediaWikiSearchDocsAction extends AnAction {
-    public void update(AnActionEvent event) {
+    public void update(@NotNull AnActionEvent event) {
         boolean enabled = getSelectedText(event) != null;
         event.getPresentation().setEnabled(enabled);
         event.getPresentation().setVisible(enabled);
@@ -49,7 +50,7 @@ private static String getSelectedText(AnActionEvent e) {
         return StringUtil.nullize(selectedText, true);
     }
 
-    public void actionPerformed(AnActionEvent event) {
+    public void actionPerformed(@NotNull AnActionEvent event) {
         String selectedText = getSelectedText(event);
         if (selectedText == null) {
             return;
@@ -59,10 +60,10 @@ public void actionPerformed(AnActionEvent event) {
 
     @NonNls
     private static String getSearchUrl(@NotNull String textToSearch) {
-        try {
-            return "https://www.mediawiki.org/w/index.php?title=Special%3ASearch&profile=default&fulltext=Search&search=" + URLEncoder.encode(textToSearch, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-        }
-        return "";
+        return "https://www.mediawiki.org/w/index.php?title=Special%3ASearch&profile=default&fulltext=Search&search=" + URLEncoder.encode(textToSearch, StandardCharsets.UTF_8);
+    }
+
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
     }
 }