Merge branch 'master' into fix-autocomplete-codeblock

2025-12-14 02:06:29 +00:00 · 2018-12-27 22:57:05 +01:00
parent 87515dbd3f 05da826c24
commit 12f9b9342d
100 changed files with 221693 additions and 712 deletions
--- a/browser/main/modals/PreferencesModal/SnippetEditor.js
+++ b/browser/main/modals/PreferencesModal/SnippetEditor.js
@@ -29,14 +29,14 @@ class SnippetEditor extends React.Component {
      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
      autoCloseBrackets: {
        codeBlock: {
-          pairs: '()[]{}\'\'""``',
-          triples: '',
-          explode: '[]{}``'
+          pairs: this.props.codeBlockMatchingPairs,
+          triples: this.props.codeBlockMatchingTriples,
+          explode: this.props.codeBlockExplodingPairs
        },
        markdown: {
-          pairs: '()[]{}\'\'""$$**``',
-          triples: '```"""\'\'\'',
-          explode: '[]{}``$$'
+          pairs: this.props.matchingPairs,
+          triples: this.props.matchingTriples,
+          explode: this.props.explodingPairs
        }
      },
      mode: 'null'