Merge pull request #106 from kezhenxu94/bugfix-doc

add doc and fix bug

Author: wuseal

README.md

@@ -44,7 +44,7 @@ This is a very cool tool for Kotlin developers, it can convert a JSON string to
 Have a try with the settings dialog :stuck_out_tongue_winking_eye:
 
 ### Features
-* Generating Kotlin data class from any legal JSON string or any **URLs that returns a JSON string as response**
+* Generating Kotlin data class from any legal JSON string or any **URLs that returns a JSON string as response** or **local file that contains JSON string**, for more detail about supported source types, refer to [the documentation](https://github.com/wuseal/JsonToKotlinClass/blob/3.0/doc_for_json_sources.md)
 * Generating Kotlin data class from any legal JSON text when right click on directory and select `New` -> `Kotlin data class File from JSON`
 * Supporting (almostly) all kinds of JSON libs' annotation(Gson, Jackson, Fastjson, MoShi and LoganSquare, kotlinx.serialization(default custom value))
 * [Customizing your own annotations](https://github.com/wuseal/JsonToKotlinClass/issues/19)

doc_for_json_sources.md

@@ -0,0 +1,23 @@
+Here we currently support 3 types of JSON sources: `clipboard/input manually`, `Http Url` and `local file`, each of them are used as follows:
+
+- clipboard/input manually
+
+With this source type, you can edit the JSON string directly in the text area in the dialog,
+
+[![type_directly](https://user-images.githubusercontent.com/15965696/51297231-72fbe380-1a5a-11e9-8d28-1294ecc3d221.gif)]
+
+or paste JSON string from clipboard using shortcut `Ctrl+V` or `Command+V`.
+
+- Http Url
+
+With this source type, you can retrieve JSON string from a http GET request, to do this, right click on the text area and choose "Retrieve content from Http URL",
+
+[![http](https://user-images.githubusercontent.com/15965696/51297482-6af07380-1a5b-11e9-8f3d-8b398dd82f34.gif)]
+
+- Local File
+
+With this source type, you can load a JSON string from a local file, to do this, right click on the text area and choose "Load from local file",
+
+![local_file](https://user-images.githubusercontent.com/15965696/51298233-c5d79a00-1a5e-11e9-9a99-a65f09d90efc.gif)
+
+If you want more types of source, please open an issue [here](https://github.com/wuseal/JsonToKotlinClass/issues) or implement yourself and create a pull request [here](https://github.com/wuseal/JsonToKotlinClass/pulls).

src/main/kotlin/wu/seal/jsontokotlin/ui/JsonInputDialog.kt

@@ -2,6 +2,8 @@ package wu.seal.jsontokotlin.ui
 
 import com.google.gson.*
 import com.intellij.json.JsonFileType
+import com.intellij.openapi.application.Application
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.fileChooser.FileChooser
@@ -194,7 +196,9 @@ class JsonInputDialog(classsName: String, private val project: Project) : Messag
         addActionListener {
             FileChooser.chooseFile(FileChooserDescriptor(true, false, false, false, false, false), null, null) { file ->
                 val content = String(file.contentsToByteArray())
-                jsonContentEditor.document.setText(content)
+                ApplicationManager.getApplication().runWriteAction {
+                    jsonContentEditor.document.setText(content.replace("\r\n", "\n"))
+                }
             }
         }
     }