Update per https://www.mediawiki.org/w/index.php?title=PhpStorm&oldid=938244

Bump 0.1

Author: reedy

META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <id>org.mediawiki</id>
   <name>MediaWiki Support</name>
-  <version>0.0.1</version>
+  <version>0.1</version>
   <vendor email="[email protected]" url="https://www.mediawiki.org">Wikimedia Foundation</vendor>
 
   <description>MediaWiki Support for PhpStorm
@@ -11,7 +11,7 @@ Source is available on GitHub at https://github.com/reedy/phpstorm-plugin-mediaw
 Pull requests and issues welcome.
   </description>
 
-  <change-notes>Version 0.0.1: Initial version</change-notes>
+  <change-notes>Version 0.1: Initial version</change-notes>
 
   <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
   <idea-version since-build="131"/>

src/org/mediawiki/MediaWikiCSSPredefinedCodeStyle.java

@@ -36,6 +36,9 @@ public void apply(CodeStyleSettings settings) {
         indentOptions.SMART_TABS = true;
         indentOptions.TAB_SIZE = 4;
         indentOptions.INDENT_SIZE = 4;
-        indentOptions.CONTINUATION_INDENT_SIZE = 4;
+        indentOptions.CONTINUATION_INDENT_SIZE = 8;
+        indentOptions.LABEL_INDENT_SIZE = 0;
+        indentOptions.LABEL_INDENT_ABSOLUTE = false;
+        indentOptions.USE_RELATIVE_INDENTS = false;
     }
 }

src/org/mediawiki/MediaWikiHTMLPredefinedCodeStyle.java

@@ -36,6 +36,9 @@ public void apply(CodeStyleSettings settings) {
         indentOptions.SMART_TABS = true;
         indentOptions.TAB_SIZE = 4;
         indentOptions.INDENT_SIZE = 4;
-        indentOptions.CONTINUATION_INDENT_SIZE = 4;
+        indentOptions.CONTINUATION_INDENT_SIZE = 8;
+        indentOptions.LABEL_INDENT_SIZE = 0;
+        indentOptions.LABEL_INDENT_ABSOLUTE = false;
+        indentOptions.USE_RELATIVE_INDENTS = false;
     }
 }

src/org/mediawiki/MediaWikiPhpPredefinedCodeStyle.java

@@ -20,9 +20,16 @@ public void apply(CodeStyleSettings settings) {
         CommonCodeStyleSettings commonSettings = settings.getCommonSettings(getLanguage());
         commonSettings.KEEP_BLANK_LINES_IN_CODE = 1;
         commonSettings.KEEP_BLANK_LINES_BEFORE_RBRACE = 0;
+        commonSettings.KEEP_LINE_BREAKS = false;
+        commonSettings.KEEP_CONTROL_STATEMENT_IN_ONE_LINE = false;
+
         commonSettings.CLASS_BRACE_STYLE = 1;
         commonSettings.METHOD_BRACE_STYLE = 1;
+
+        commonSettings.CATCH_ON_NEW_LINE = true;
+
         commonSettings.ALIGN_MULTILINE_PARAMETERS = false;
+
         commonSettings.SPACE_WITHIN_PARENTHESES = true;
         commonSettings.SPACE_WITHIN_METHOD_CALL_PARENTHESES = true;
         commonSettings.SPACE_WITHIN_METHOD_PARENTHESES = true;
@@ -33,7 +40,11 @@ public void apply(CodeStyleSettings settings) {
         commonSettings.SPACE_WITHIN_SWITCH_PARENTHESES = true;
         commonSettings.SPACE_WITHIN_ARRAY_INITIALIZER_BRACES = true;
         commonSettings.SPACE_AFTER_TYPE_CAST = true;
+
         commonSettings.IF_BRACE_FORCE = 3;
+        commonSettings.FOR_BRACE_FORCE = 3;
+        commonSettings.DOWHILE_BRACE_FORCE = 3;
+        commonSettings.WHILE_BRACE_FORCE = 3;
 
         PhpCodeStyleSettings phpSettings = settings.getCustomSettings(PhpCodeStyleSettings.class);
         phpSettings.LOWER_CASE_BOOLEAN_CONST = true;
@@ -46,6 +57,9 @@ public void apply(CodeStyleSettings settings) {
         indentOptions.SMART_TABS = true;
         indentOptions.TAB_SIZE = 4;
         indentOptions.INDENT_SIZE = 4;
-        indentOptions.CONTINUATION_INDENT_SIZE = 4;
+        indentOptions.CONTINUATION_INDENT_SIZE = 8;
+        indentOptions.LABEL_INDENT_SIZE = 0;
+        indentOptions.LABEL_INDENT_ABSOLUTE = false;
+        indentOptions.USE_RELATIVE_INDENTS = false;
     }
 }