Merge pull request ably#616 from ably/feature/tabs-to-spaces-config

Update EditorConfig

Author: Quintin Willison

.editorconfig

@@ -6,8 +6,12 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
-indent_style = tab
+indent_style = space
+indent_size = 2
+
+[*.java]
+indent_style = space
+indent_size = 4
 
 [*.md]
 trim_trailing_whitespace = false
-

README.md

@@ -497,6 +497,11 @@ You can run just the Checkstyle rules on their own using:
 
     ./gradlew checkstyleMain
 
+We have a root [`.editorconfig`](.editorconfig) file, supporting [EditorConfig](https://editorconfig.org/), which should be of assistance within most IDEs. e.g.:
+
+- [VS Code](https://code.visualstudio.com/) using the [EditorConfig plugin](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig)
+- [IntelliJ IDEA](https://www.jetbrains.com/idea/) using the [bundled plugin](https://www.jetbrains.com/help/idea/configuring-code-style.html#editorconfig).
+
 ## Tests
 
 A gradle wrapper is included so these tasks can run without any prior installation of gradle. The Linux/OSX form of the commands, given below, is:

config/checkstyle/checkstyle.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-		"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-		"https://checkstyle.org/dtds/configuration_1_3.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
-	<property name="charset" value="UTF-8"/>
+  <property name="charset" value="UTF-8"/>
 
-	<module name="FileTabCharacter"/>
+  <module name="FileTabCharacter"/>
 
-	<module name="TreeWalker">
-		<module name="RedundantModifier"/>
-		<module name="UnusedImports"/>
-		<module name="AvoidStarImport"/>
-	</module>
+  <module name="TreeWalker">
+    <module name="RedundantModifier"/>
+    <module name="UnusedImports"/>
+    <module name="AvoidStarImport"/>
+  </module>
 </module>