From 75f55481f15445a34c8c8d76830ad75672bfe2fc Mon Sep 17 00:00:00 2001 From: Olcod Date: Thu, 3 Oct 2019 00:47:52 +1000 Subject: [PATCH 1/2] Add ability to sort lines with a hot key combination --- browser/components/CodeEditor.js | 9 +++++++++ browser/main/lib/ConfigManager.js | 1 + 2 files changed, 10 insertions(+) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index a54489078..9214363ed 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -241,6 +241,15 @@ export default class CodeEditor extends React.Component { const newCursorPos = cm.doc.posFromIndex(formattedCursorPos) cm.doc.setCursor(newCursorPos) }, + [translateHotkey(hotkey.sortLines)]: cm => { + const selection = cm.doc.getSelection() + const appendLineBreak = /\n$/.test(selection) + + const sorted = _.split(selection.trim(), '\n').sort() + const sortedString = _.join(sorted, '\n') + (appendLineBreak ? '\n' : '') + + cm.doc.replaceSelection(sortedString) + }, [translateHotkey(hotkey.pasteSmartly)]: cm => { this.handlePaste(cm, true) } diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index b753c5159..a3454b30d 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -32,6 +32,7 @@ export const DEFAULT_CONFIG = { deleteNote: OSX ? 'Command + Shift + Backspace' : 'Ctrl + Shift + Backspace', pasteSmartly: OSX ? 'Command + Shift + V' : 'Ctrl + Shift + V', prettifyMarkdown: 'Shift + F', + sortLines: OSX ? 'Command + Shift + S' : 'Ctrl + Shift + S', insertDate: OSX ? 'Command + /' : 'Ctrl + /', insertDateTime: OSX ? 'Command + Alt + /' : 'Ctrl + Shift + /', toggleMenuBar: 'Alt' From 01e12d38faf09de68ee5261fa19f094d783ef6ac Mon Sep 17 00:00:00 2001 From: Olcod Date: Thu, 3 Oct 2019 01:00:23 +1000 Subject: [PATCH 2/2] Added package-lock file to the gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ace5316cb..aac649500 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ node_modules/* /secret *.log .idea -.vscode \ No newline at end of file +.vscode +package-lock.json