Merge pull request #719 from JunoLab/avi/jlfmtopts

allow more JuliaFormatter options

Author: aviatesk

lib/package/config.coffee

@@ -186,6 +186,53 @@ config =
             type: 'boolean'
             default: false
             order: 6
+          import_to_using:
+            title: 'import_to_using'
+            description:
+              '''
+              If true import expressions are rewritten to using expressions in cases like:
+              `import A` is rewritten to `using A: A`
+              '''
+            type: 'boolean'
+            default: false
+            order: 7
+          pipe_to_function_call:
+            title: 'pipe_to_function_call'
+            description:
+              '''
+              If true `f |> x` is rewritten to `f(x)`.
+              '''
+            type: 'boolean'
+            default: false
+            order: 8
+          short_to_long_function_def:
+            title: 'short_to_long_function_def'
+            description:
+              '''
+              Transforms a _short_ function definition to a _long_ function definition
+              '''
+            type: 'boolean'
+            default: false
+            order: 9
+          always_use_return:
+            title: 'always_use_return'
+            description:
+              '''
+              If true `return` will be prepended to the last expression where applicable in function definitions, macro definitions, and do blocks.
+              '''
+            type: 'boolean'
+            default: false
+            order: 10
+          use_YAS_style:
+            title: 'YAS style'
+            description:
+              '''
+              If true use formatting style based on [YASGuide](https://github.com/jrevels/YASGuide).
+              See [JuliaFormatter's documentation](https://domluna.github.io/JuliaFormatter.jl/dev/yas_style/#) for more details.
+              '''
+            type: 'boolean'
+            default: false
+            order: 11
 
   uiOptions:
     title: 'UI Options'

lib/runtime/formatter.js

@@ -31,7 +31,7 @@ function formatEditorWithSelection (editor, selection) {
 
 function formatEditorTextInRange (editor, range, text) {
   const marker = markRange(editor, range)
-  // @NOTE: Branch on `getSoftTabs` if supported by formatter.
+  // NOTE: Branch on `getSoftTabs` if supported by formatter.
   let indent = atom.config.get('julia-client.juliaOptions.formattingOptions.indent')
   if (indent === -1) indent = editor.getTabLength()
   let margin = atom.config.get('julia-client.juliaOptions.formattingOptions.margin')
@@ -40,10 +40,20 @@ function formatEditorTextInRange (editor, range, text) {
     text,
     indent,
     margin,
+
+    // TODO:
+    // maintaining those lists are not so fun;
+    // do https://github.com/domluna/JuliaFormatter.jl/issues/184 and switch to respect a project configuration,
+    // then we will be able to leave each user to set those configurations
     always_for_in: atom.config.get('julia-client.juliaOptions.formattingOptions.always_for_in'),
     whitespace_typedefs: atom.config.get('julia-client.juliaOptions.formattingOptions.whitespace_typedefs'),
     whitespace_ops_in_indices: atom.config.get('julia-client.juliaOptions.formattingOptions.whitespace_ops_in_indices'),
-    remove_extra_newlines: atom.config.get('julia-client.juliaOptions.formattingOptions.remove_extra_newlines')
+    remove_extra_newlines: atom.config.get('julia-client.juliaOptions.formattingOptions.remove_extra_newlines'),
+    import_to_using: atom.config.get('julia-client.juliaOptions.formattingOptions.import_to_using'),
+    pipe_to_function_call: atom.config.get('julia-client.juliaOptions.formattingOptions.pipe_to_function_call'),
+    short_to_long_function_def: atom.config.get('julia-client.juliaOptions.formattingOptions.short_to_long_function_def'),
+    always_use_return: atom.config.get('julia-client.juliaOptions.formattingOptions.always_use_return'),
+    use_YAS_style: atom.config.get('julia-client.juliaOptions.formattingOptions.use_YAS_style'),
   }).then(({ error, formattedtext }) => {
     if (error) {
       atom.notifications.addError('Julia-Client: Format-Code', {