From 1abbc53ab97bca76f44f5dfc78c248bce5546a9f Mon Sep 17 00:00:00 2001 From: Luca Trevisani Date: Sat, 31 Aug 2019 00:26:43 +0200 Subject: [PATCH 1/5] Use `black` formatter by default --- .../nbextensions/code_prettify/code_prettify.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml index 03dda084d..abc9bcde6 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml +++ b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml @@ -60,8 +60,8 @@ Parameters: default: | { "python": { - "library": "import json\ndef yapf_reformat(cell_text):\n import yapf.yapflib.yapf_api\n import re\n cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)\n reformated_text = yapf.yapflib.yapf_api.FormatCode(cell_text)[0]\n return re.sub('^#%#', '%', reformated_text, flags=re.M)", - "prefix": "print(json.dumps(yapf_reformat(u", + "library": "import json\ndef black_reformat(cell_text):\n import black\n import re\n cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)\n try:\n reformated_text = black.format_str(cell_text, 88)\n except TypeError:\n reformated_text = black.format_str(cell_text, mode=black.FileMode(line_length=88))\n return re.sub('^#%#', '%', reformated_text, flags=re.M)", + "prefix": "print(json.dumps(black_reformat(u", "postfix": ")))" }, "r": { From 50270bfebbf5eb5e5d9c0d1ed0ad5f71823cdf42 Mon Sep 17 00:00:00 2001 From: Luca Trevisani Date: Sat, 31 Aug 2019 00:29:30 +0200 Subject: [PATCH 2/5] Use `black` formatter by default --- .../nbextensions/code_prettify/code_prettify.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js index 1d9ea5202..efb9cfb73 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js @@ -24,16 +24,17 @@ define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) { cfg.kernel_config_map = { // map of parameters for supported kernels "python": { "library": ["import json", - "def yapf_reformat(cell_text):", - " import yapf.yapflib.yapf_api", - " from yapf import file_resources", - " import os", + "library": ["import json", + "def black_reformat(cell_text):", + " import black", " import re", - " style_config = file_resources.GetDefaultStyleForDir(os.getcwd())", " cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)", - " reformated_text = yapf.yapflib.yapf_api.FormatCode(cell_text, style_config=style_config)[0]", + " try:" + " reformated_text = black.format_str(cell_text, 88)", + " except TypeError:" + " reformated_text = black.format_str(cell_text, mode=black.FileMode(line_length=88))", " return re.sub('^#%#', '%', reformated_text, flags=re.M)"].join("\n"), - "prefix": "print(json.dumps(yapf_reformat(u", + "prefix": "print(json.dumps(black_reformat(u", "postfix": ")))" }, "r": { From 23aa4e9748762ac390a16bd303b3f066620f74d6 Mon Sep 17 00:00:00 2001 From: Luca Trevisani Date: Sat, 1 Feb 2020 18:44:55 +0100 Subject: [PATCH 3/5] Fix Black 19 API --- .../nbextensions/code_prettify/code_prettify.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js index efb9cfb73..a116fa527 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js +++ b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js @@ -24,15 +24,11 @@ define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) { cfg.kernel_config_map = { // map of parameters for supported kernels "python": { "library": ["import json", - "library": ["import json", - "def black_reformat(cell_text):", + "def black_reformat(cell_text):", " import black", " import re", " cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)", - " try:" - " reformated_text = black.format_str(cell_text, 88)", - " except TypeError:" - " reformated_text = black.format_str(cell_text, mode=black.FileMode(line_length=88))", + " reformated_text = black.format_str(cell_text, mode=black.FileMode(line_length=88))", " return re.sub('^#%#', '%', reformated_text, flags=re.M)"].join("\n"), "prefix": "print(json.dumps(black_reformat(u", "postfix": ")))" From 0c3f5ec533fc08a5b2c29c6ad056c3d79db16f96 Mon Sep 17 00:00:00 2001 From: Luca Trevisani Date: Sat, 1 Feb 2020 18:45:59 +0100 Subject: [PATCH 4/5] Fix Black 19 API --- .../nbextensions/code_prettify/code_prettify.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml index abc9bcde6..6441e2e63 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml +++ b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml @@ -41,11 +41,6 @@ Parameters: input_type: hotkey default: 'Ctrl-Shift-L' -- name: code_prettify.show_alerts_for_not_supported_kernel - description: Show alerts if the kernel is not supported - input_type: checkbox - default: false - - name: code_prettify.show_alerts_for_errors description: Show alerts for errors in the kernel prettifying calls input_type: checkbox @@ -60,7 +55,7 @@ Parameters: default: | { "python": { - "library": "import json\ndef black_reformat(cell_text):\n import black\n import re\n cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)\n try:\n reformated_text = black.format_str(cell_text, 88)\n except TypeError:\n reformated_text = black.format_str(cell_text, mode=black.FileMode(line_length=88))\n return re.sub('^#%#', '%', reformated_text, flags=re.M)", + "library": "import json\ndef black(cell_text):\n import black\n import re\n cell_text = re.sub('^%', '#%#', cell_text, flags=re.M)\n reformated_text = black.format_str(cell_text, mode=black.FileMode(line_length=88))\n return re.sub('^#%#', '%', reformated_text, flags=re.M)", "prefix": "print(json.dumps(black_reformat(u", "postfix": ")))" }, From 716618bb49ec4a696f340fd9ac980fdb8bc6dab3 Mon Sep 17 00:00:00 2001 From: Luca Trevisani Date: Sat, 1 Feb 2020 18:52:09 +0100 Subject: [PATCH 5/5] Restore alerts --- .../nbextensions/code_prettify/code_prettify.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml index 6441e2e63..1b93b8126 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml +++ b/src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.yaml @@ -41,6 +41,11 @@ Parameters: input_type: hotkey default: 'Ctrl-Shift-L' +- name: code_prettify.show_alerts_for_not_supported_kernel + description: Show alerts if the kernel is not supported + input_type: checkbox + default: false + - name: code_prettify.show_alerts_for_errors description: Show alerts for errors in the kernel prettifying calls input_type: checkbox