jenkins-bot has submitted this change and it was merged.
Change subject: Update PhpStorm code style
......................................................................
Update PhpStorm code style
* Use 100 chars margin
* Basic style for LESS
* Use 2 spaces for Puppet
Change-Id: Ia557cccc26153eb9ad93c42ccd6ff6a1839e52a6
---
M .idea/codeStyleSettings.xml
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 24ddc32..60ae90c 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -16,7 +16,7 @@
</value>
</option>
<option name="LINE_SEPARATOR" value=" " />
- <option name="RIGHT_MARGIN" value="110" />
+ <option name="RIGHT_MARGIN" value="100" />
<XML>
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
@@ -24,6 +24,13 @@
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
<option name="SMART_TABS" value="true" />
+ </indentOptions>
+ </codeStyleSettings>
+ <codeStyleSettings language="LESS">
+ <indentOptions>
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="PHP">
@@ -70,13 +77,11 @@
</codeStyleSettings>
<codeStyleSettings language="Puppet">
<indentOptions>
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- </indentOptions>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="2" />
</codeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
</project>
-
--
To view, visit https://gerrit.wikimedia.org/r/172888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia557cccc26153eb9ad93c42ccd6ff6a1839e52a6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
