Bump webpack-dev-server from 1.16.5 to 3.1.11

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 1.16.5 to 3.1.11.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v1.16.5...v3.1.11)

Signed-off-by: dependabot[bot] <support@github.com>

browser/components/CodeEditor.js

@@ -170,10 +170,6 @@ export default class CodeEditor extends React.Component {
   }
 
   handleEditorActivity() {
-    if (this.props.onCursorActivity) {
-      this.props.onCursorActivity(this.editor)
-    }
-
     if (!this.textEditorInterface.transaction) {
       this.updateTableEditorState()
     }
@@ -235,19 +231,11 @@ export default class CodeEditor extends React.Component {
       },
       [translateHotkey(hotkey.insertDate)]: function(cm) {
         const dateNow = new Date()
-        if (self.props.dateFormatISO8601) {
-          cm.replaceSelection(dateNow.toISOString().split('T')[0])
-        } else {
         cm.replaceSelection(dateNow.toLocaleDateString())
-        }
       },
       [translateHotkey(hotkey.insertDateTime)]: function(cm) {
         const dateNow = new Date()
-        if (self.props.dateFormatISO8601) {
-          cm.replaceSelection(dateNow.toISOString())
-        } else {
         cm.replaceSelection(dateNow.toLocaleString())
-        }
       },
       Enter: 'boostNewLineAndIndentContinueMarkdownList',
       'Ctrl-C': cm => {
@@ -345,18 +333,10 @@ export default class CodeEditor extends React.Component {
         'CodeMirror-lint-markers'
       ],
       autoCloseBrackets: {
-        codeBlock: {
-          pairs: this.props.codeBlockMatchingPairs,
-          closeBefore: this.props.codeBlockMatchingCloseBefore,
-          triples: this.props.codeBlockMatchingTriples,
-          explode: this.props.codeBlockExplodingPairs
-        },
-        markdown: {
         pairs: this.props.matchingPairs,
-          closeBefore: this.props.matchingCloseBefore,
         triples: this.props.matchingTriples,
-          explode: this.props.explodingPairs
+        explode: this.props.explodingPairs,
-        }
+        override: true
       },
       extraKeys: this.defaultKeyMap,
       prettierConfig: this.props.prettierConfig
@@ -384,7 +364,6 @@ export default class CodeEditor extends React.Component {
 
     eventEmitter.emit('code:init')
     this.editor.on('scroll', this.scrollHandler)
-    this.editor.on('cursorActivity', this.editorActivityHandler)
 
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.addEventListener('load', this.loadStyleHandler)
@@ -522,6 +501,7 @@ export default class CodeEditor extends React.Component {
     })
 
     if (this.props.enableTableEditor) {
+      this.editor.on('cursorActivity', this.editorActivityHandler)
       this.editor.on('changes', this.editorActivityHandler)
     }
 
@@ -580,18 +560,12 @@ export default class CodeEditor extends React.Component {
     this.editor.off('paste', this.pasteHandler)
     eventEmitter.off('top:search', this.searchHandler)
     this.editor.off('scroll', this.scrollHandler)
-    this.editor.off('cursorActivity', this.editorActivityHandler)
     this.editor.off('contextmenu', this.contextMenuHandler)
-
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.removeEventListener('load', this.loadStyleHandler)
 
     spellcheck.setLanguage(null, spellcheck.SPELLCHECK_DISABLED)
     eventEmitter.off('code:format-table', this.formatTable)
-
-    if (this.props.enableTableEditor) {
-      this.editor.off('changes', this.editorActivityHandler)
-    }
   }
 
   componentDidUpdate(prevProps, prevState) {
@@ -667,32 +641,16 @@ export default class CodeEditor extends React.Component {
 
     if (
       prevProps.matchingPairs !== this.props.matchingPairs ||
-      prevProps.matchingCloseBefore !== this.props.matchingCloseBefore ||
       prevProps.matchingTriples !== this.props.matchingTriples ||
-      prevProps.explodingPairs !== this.props.explodingPairs ||
+      prevProps.explodingPairs !== this.props.explodingPairs
-      prevProps.codeBlockMatchingPairs !== this.props.codeBlockMatchingPairs ||
-      prevProps.codeBlockMatchingCloseBefore !==
-        this.props.codeBlockMatchingCloseBefore ||
-      prevProps.codeBlockMatchingTriples !==
-        this.props.codeBlockMatchingTriples ||
-      prevProps.codeBlockExplodingPairs !== this.props.codeBlockExplodingPairs
     ) {
-      const autoCloseBrackets = {
+      const bracketObject = {
-        codeBlock: {
-          pairs: this.props.codeBlockMatchingPairs,
-          closeBefore: this.props.codeBlockMatchingCloseBefore,
-          triples: this.props.codeBlockMatchingTriples,
-          explode: this.props.codeBlockExplodingPairs
-        },
-        markdown: {
         pairs: this.props.matchingPairs,
-          closeBefore: this.props.matchingCloseBefore,
         triples: this.props.matchingTriples,
-          explode: this.props.explodingPairs
+        explode: this.props.explodingPairs,
+        override: true
       }
-      }
+      this.editor.setOption('autoCloseBrackets', bracketObject)
-
-      this.editor.setOption('autoCloseBrackets', autoCloseBrackets)
     }
 
     if (prevProps.enableTableEditor !== this.props.enableTableEditor) {

browser/components/MarkdownEditor.js

@@ -139,7 +139,7 @@ class MarkdownEditor extends React.Component {
         },
         () => {
           this.previewRef.current.focus()
-          this.previewRef.current.scrollToLine(cursorPosition.line)
+          this.previewRef.current.scrollToRow(cursorPosition.line)
         }
       )
       eventEmitter.emit('topbar:togglelockbutton', this.state.status)
@@ -365,15 +365,8 @@ class MarkdownEditor extends React.Component {
           displayLineNumbers={config.editor.displayLineNumbers}
           lineWrapping
           matchingPairs={config.editor.matchingPairs}
-          matchingCloseBefore={config.editor.matchingCloseBefore}
           matchingTriples={config.editor.matchingTriples}
           explodingPairs={config.editor.explodingPairs}
-          codeBlockMatchingPairs={config.editor.codeBlockMatchingPairs}
-          codeBlockMatchingCloseBefore={
-            config.editor.codeBlockMatchingCloseBefore
-          }
-          codeBlockMatchingTriples={config.editor.codeBlockMatchingTriples}
-          codeBlockExplodingPairs={config.editor.codeBlockExplodingPairs}
           scrollPastEnd={config.editor.scrollPastEnd}
           storageKey={storageKey}
           noteKey={noteKey}
@@ -388,7 +381,6 @@ class MarkdownEditor extends React.Component {
           switchPreview={config.editor.switchPreview}
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
-          dateFormatISO8601={config.editor.dateFormatISO8601}
           prettierConfig={config.editor.prettierConfig}
           deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
           RTL={RTL}

browser/components/MarkdownPreview.js

@@ -1145,18 +1145,17 @@ class MarkdownPreview extends React.Component {
 
   /**
    * @public
-   * @param {Number} targetLine
+   * @param {Number} targetRow
    */
-  scrollToLine(targetLine) {
+  scrollToRow(targetRow) {
     const blocks = this.getWindow().document.querySelectorAll(
-      'body [data-line]'
+      'body>[data-line]'
     )
 
     for (let index = 0; index < blocks.length; index++) {
       let block = blocks[index]
-      const line = parseInt(block.getAttribute('data-line'))
+      const row = parseInt(block.getAttribute('data-line'))
-
+      if (row > targetRow || index === blocks.length - 1) {
-      if (line > targetLine || index === blocks.length - 1) {
         block = blocks[index - 1]
         block != null && this.scrollTo(0, block.offsetTop)
         break

browser/components/MarkdownSplitEditor.js

@@ -13,7 +13,7 @@ class MarkdownSplitEditor extends React.Component {
     this.value = props.value
     this.focus = () => this.refs.code.focus()
     this.reload = () => this.refs.code.reload()
-    this.userScroll = props.config.preview.scrollSync
+    this.userScroll = true
     this.state = {
       isSliderFocused: false,
       codeEditorWidthInPercent: 50,
@@ -21,72 +21,6 @@ class MarkdownSplitEditor extends React.Component {
     }
   }
 
-  componentDidUpdate(prevProps) {
-    if (
-      this.props.config.preview.scrollSync !==
-      prevProps.config.preview.scrollSync
-    ) {
-      this.userScroll = this.props.config.preview.scrollSync
-    }
-  }
-
-  handleCursorActivity(editor) {
-    if (this.userScroll) {
-      const previewDoc = _.get(
-        this,
-        'refs.preview.refs.root.contentWindow.document'
-      )
-      const previewTop = _.get(previewDoc, 'body.scrollTop')
-
-      const line = editor.doc.getCursor().line
-      let top
-      if (line === 0) {
-        top = 0
-      } else {
-        const blockElements = previewDoc.querySelectorAll('body [data-line]')
-        const blocks = []
-        for (const block of blockElements) {
-          const l = parseInt(block.getAttribute('data-line'))
-
-          blocks.push({
-            line: l,
-            top: block.offsetTop
-          })
-
-          if (l > line) {
-            break
-          }
-        }
-
-        if (blocks.length === 1) {
-          const block = blockElements[blockElements.length - 1]
-
-          blocks.push({
-            line: editor.doc.size,
-            top: block.offsetTop + block.offsetHeight
-          })
-        }
-
-        const i = blocks.length - 1
-
-        const ratio =
-          (blocks[i].top - blocks[i - 1].top) /
-          (blocks[i].line - blocks[i - 1].line)
-
-        const delta = Math.floor(_.get(previewDoc, 'body.clientHeight') / 3)
-
-        top =
-          blocks[i - 1].top +
-          Math.floor((line - blocks[i - 1].line) * ratio) -
-          delta
-      }
-
-      this.scrollTo(previewTop, top, y =>
-        _.set(previewDoc, 'body.scrollTop', y)
-      )
-    }
-  }
-
   setValue(value) {
     this.refs.code.setValue(value)
   }
@@ -96,125 +30,59 @@ class MarkdownSplitEditor extends React.Component {
     this.props.onChange(e)
   }
 
-  handleEditorScroll(e) {
+  handleScroll(e) {
-    if (this.userScroll) {
+    if (!this.props.config.preview.scrollSync) return
+
     const previewDoc = _.get(
       this,
       'refs.preview.refs.root.contentWindow.document'
     )
     const codeDoc = _.get(this, 'refs.code.editor.doc')
+    let srcTop, srcHeight, targetTop, targetHeight
 
-      const from = codeDoc.cm.coordsChar({ left: 0, top: 0 }).line
-      const to = codeDoc.cm.coordsChar({
-        left: 0,
-        top: codeDoc.cm.display.lastWrapHeight * 1.125
-      }).line
-      const previewTop = _.get(previewDoc, 'body.scrollTop')
-
-      let top
-      if (from === 0) {
-        top = 0
-      } else if (to === codeDoc.lastLine()) {
-        top =
-          _.get(previewDoc, 'body.scrollHeight') -
-          _.get(previewDoc, 'body.clientHeight')
-      } else {
-        const line = from + Math.floor((to - from) / 3)
-
-        const blockElements = previewDoc.querySelectorAll('body [data-line]')
-        const blocks = []
-        for (const block of blockElements) {
-          const l = parseInt(block.getAttribute('data-line'))
-
-          blocks.push({
-            line: l,
-            top: block.offsetTop
-          })
-
-          if (l > line) {
-            break
-          }
-        }
-
-        if (blocks.length === 1) {
-          const block = blockElements[blockElements.length - 1]
-
-          blocks.push({
-            line: codeDoc.size,
-            top: block.offsetTop + block.offsetHeight
-          })
-        }
-
-        const i = blocks.length - 1
-
-        const ratio =
-          (blocks[i].top - blocks[i - 1].top) /
-          (blocks[i].line - blocks[i - 1].line)
-
-        top =
-          blocks[i - 1].top + Math.floor((line - blocks[i - 1].line) * ratio)
-      }
-
-      this.scrollTo(previewTop, top, y =>
-        _.set(previewDoc, 'body.scrollTop', y)
-      )
-    }
-  }
-
-  handlePreviewScroll(e) {
     if (this.userScroll) {
-      const previewDoc = _.get(
+      if (e.doc) {
-        this,
+        srcTop = _.get(e, 'doc.scrollTop')
-        'refs.preview.refs.root.contentWindow.document'
+        srcHeight = _.get(e, 'doc.height')
-      )
+        targetTop = _.get(previewDoc, 'body.scrollTop')
-      const codeDoc = _.get(this, 'refs.code.editor.doc')
+        targetHeight = _.get(previewDoc, 'body.scrollHeight')
-
-      const srcTop = _.get(previewDoc, 'body.scrollTop')
-      const editorTop = _.get(codeDoc, 'scrollTop')
-
-      let top
-      if (srcTop === 0) {
-        top = 0
       } else {
-        const delta = Math.floor(_.get(previewDoc, 'body.clientHeight') / 3)
+        srcTop = _.get(previewDoc, 'body.scrollTop')
-        const previewTop = srcTop + delta
+        srcHeight = _.get(previewDoc, 'body.scrollHeight')
-
+        targetTop = _.get(codeDoc, 'scrollTop')
-        const blockElements = previewDoc.querySelectorAll('body [data-line]')
+        targetHeight = _.get(codeDoc, 'height')
-        const blocks = []
-        for (const block of blockElements) {
-          const top = block.offsetTop
-
-          blocks.push({
-            line: parseInt(block.getAttribute('data-line')),
-            top
-          })
-
-          if (top > previewTop) {
-            break
-          }
       }
 
-        if (blocks.length === 1) {
+      const distance = (targetHeight * srcTop) / srcHeight - targetTop
-          const block = blockElements[blockElements.length - 1]
+      const framerate = 1000 / 60
+      const frames = 20
+      const refractory = frames * framerate
 
-          blocks.push({
+      this.userScroll = false
-            line: codeDoc.size,
+
-            top: block.offsetTop + block.offsetHeight
+      let frame = 0
-          })
+      let scrollPos, time
+      const timer = setInterval(() => {
+        time = frame / frames
+        scrollPos =
+          time < 0.5
+            ? 2 * time * time // ease in
+            : -1 + (4 - 2 * time) * time // ease out
+        if (e.doc)
+          _.set(previewDoc, 'body.scrollTop', targetTop + scrollPos * distance)
+        else
+          _.get(this, 'refs.code.editor').scrollTo(
+            0,
+            targetTop + scrollPos * distance
+          )
+        if (frame >= frames) {
+          clearInterval(timer)
+          setTimeout(() => {
+            this.userScroll = true
+          }, refractory)
         }
-
+        frame++
-        const i = blocks.length - 1
+      }, framerate)
-
-        const from = codeDoc.cm.heightAtLine(blocks[i - 1].line, 'local')
-        const to = codeDoc.cm.heightAtLine(blocks[i].line, 'local')
-
-        const ratio =
-          (previewTop - blocks[i - 1].top) / (blocks[i].top - blocks[i - 1].top)
-
-        top = from + Math.floor((to - from) * ratio) - delta
-      }
-
-      this.scrollTo(editorTop, top, y => codeDoc.cm.scrollTo(0, y))
     }
   }
 
@@ -300,35 +168,6 @@ class MarkdownSplitEditor extends React.Component {
     })
   }
 
-  scrollTo(from, to, scroller) {
-    const distance = to - from
-    const framerate = 1000 / 60
-    const frames = 20
-    const refractory = frames * framerate
-
-    this.userScroll = false
-
-    let frame = 0
-    let scrollPos, time
-    const timer = setInterval(() => {
-      time = frame / frames
-      scrollPos =
-        time < 0.5
-          ? 2 * time * time // ease in
-          : -1 + (4 - 2 * time) * time // ease out
-
-      scroller(from + scrollPos * distance)
-
-      if (frame >= frames) {
-        clearInterval(timer)
-        setTimeout(() => {
-          this.userScroll = true
-        }, refractory)
-      }
-      frame++
-    }, framerate)
-  }
-
   render() {
     const {
       config,
@@ -421,15 +260,8 @@ class MarkdownSplitEditor extends React.Component {
           displayLineNumbers={config.editor.displayLineNumbers}
           lineWrapping
           matchingPairs={config.editor.matchingPairs}
-          matchingCloseBefore={config.editor.matchingCloseBefore}
           matchingTriples={config.editor.matchingTriples}
           explodingPairs={config.editor.explodingPairs}
-          codeBlockMatchingPairs={config.editor.codeBlockMatchingPairs}
-          codeBlockMatchingCloseBefore={
-            config.editor.codeBlockMatchingCloseBefore
-          }
-          codeBlockMatchingTriples={config.editor.codeBlockMatchingTriples}
-          codeBlockExplodingPairs={config.editor.codeBlockExplodingPairs}
           indentType={config.editor.indentType}
           indentSize={editorStyle.indentSize}
           enableRulers={config.editor.enableRulers}
@@ -441,15 +273,13 @@ class MarkdownSplitEditor extends React.Component {
           noteKey={noteKey}
           linesHighlighted={linesHighlighted}
           onChange={e => this.handleOnChange(e)}
-          onScroll={e => this.handleEditorScroll(e)}
+          onScroll={this.handleScroll.bind(this)}
-          onCursorActivity={e => this.handleCursorActivity(e)}
           spellCheck={config.editor.spellcheck}
           enableSmartPaste={config.editor.enableSmartPaste}
           hotkey={config.hotkey}
           switchPreview={config.editor.switchPreview}
           enableMarkdownLint={config.editor.enableMarkdownLint}
           customMarkdownLintConfig={config.editor.customMarkdownLintConfig}
-          dateFormatISO8601={config.editor.dateFormatISO8601}
           deleteUnusedAttachments={config.editor.deleteUnusedAttachments}
           RTL={RTL}
         />
@@ -479,7 +309,7 @@ class MarkdownSplitEditor extends React.Component {
           tabInde='0'
           value={value}
           onCheckboxClick={e => this.handleCheckboxClick(e)}
-          onScroll={e => this.handlePreviewScroll(e)}
+          onScroll={this.handleScroll.bind(this)}
           showCopyNotification={config.ui.showCopyNotification}
           storagePath={storage.path}
           noteKey={noteKey}

browser/main/Detail/SnippetNoteDetail.js

@@ -859,15 +859,8 @@ class SnippetNoteDetail extends React.Component {
               indentSize={editorIndentSize}
               displayLineNumbers={config.editor.displayLineNumbers}
               matchingPairs={config.editor.matchingPairs}
-              matchingCloseBefore={config.editor.matchingCloseBefore}
               matchingTriples={config.editor.matchingTriples}
               explodingPairs={config.editor.explodingPairs}
-              codeBlockMatchingPairs={config.editor.codeBlockMatchingPairs}
-              codeBlockMatchingCloseBefore={
-                config.editor.codeBlockMatchingCloseBefore
-              }
-              codeBlockMatchingTriples={config.editor.codeBlockMatchingTriples}
-              codeBlockExplodingPairs={config.editor.codeBlockExplodingPairs}
               keyMap={config.editor.keyMap}
               scrollPastEnd={config.editor.scrollPastEnd}
               fetchUrlTitle={config.editor.fetchUrlTitle}
@@ -877,7 +870,6 @@ class SnippetNoteDetail extends React.Component {
               enableSmartPaste={config.editor.enableSmartPaste}
               hotkey={config.hotkey}
               autoDetect={autoDetect}
-              dateFormatISO8601={config.editor.dateFormatISO8601}
               storageKey={storageKey}
               noteKey={note.key}
             />

browser/main/lib/ConfigManager.js

@@ -86,13 +86,8 @@ export const DEFAULT_CONFIG = {
     rulers: [80, 120],
     displayLineNumbers: true,
     matchingPairs: '()[]{}\'\'""$$**``~~__',
-    matchingCloseBefore: ')]}\'":;>',
     matchingTriples: '```"""\'\'\'',
     explodingPairs: '[]{}``$$',
-    codeBlockMatchingPairs: '()[]{}\'\'""``',
-    codeBlockMatchingCloseBefore: ')]}\'":;>',
-    codeBlockMatchingTriples: '',
-    codeBlockExplodingPairs: '[]{}``',
     switchPreview: 'BLUR', // 'BLUR', 'DBL_CLICK', 'RIGHTCLICK'
     delfaultStatus: 'PREVIEW', // 'PREVIEW', 'CODE'
     scrollPastEnd: false,
@@ -105,7 +100,6 @@ export const DEFAULT_CONFIG = {
     enableSmartPaste: false,
     enableMarkdownLint: false,
     customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG,
-    dateFormatISO8601: false,
     prettierConfig: `{
       "trailingComma": "es5",
       "tabWidth": 2,

browser/main/modals/PreferencesModal/ConfigTab.styl

@@ -139,13 +139,6 @@ div[id^="firstRow"]
   margin-right 10px
   font-size 14px
 
-.group-section-label-right
-  width 200px
-  text-align right
-  margin-right 10px
-  font-size 14px
-  padding-right 1.5rem
-
 .group-section-control
   flex 1
   margin-left 5px

browser/main/modals/PreferencesModal/SnippetEditor.js

@@ -35,18 +35,10 @@ class SnippetEditor extends React.Component {
       foldGutter: true,
       gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
       autoCloseBrackets: {
-        codeBlock: {
-          pairs: this.props.codeBlockMatchingPairs,
-          closeBefore: this.props.codeBlockMatchingCloseBefore,
-          triples: this.props.codeBlockMatchingTriples,
-          explode: this.props.codeBlockExplodingPairs
-        },
-        markdown: {
         pairs: this.props.matchingPairs,
-          closeBefore: this.props.matchingCloseBefore,
         triples: this.props.matchingTriples,
-          explode: this.props.explodingPairs
+        explode: this.props.explodingPairs,
-        }
+        override: true
       },
       mode: 'null'
     })

browser/main/modals/PreferencesModal/SnippetTab.js

@@ -152,15 +152,8 @@ class SnippetTab extends React.Component {
               rulers={config.editor.rulers}
               displayLineNumbers={config.editor.displayLineNumbers}
               matchingPairs={config.editor.matchingPairs}
-              matchingCloseBefore={config.editor.matchingCloseBefore}
               matchingTriples={config.editor.matchingTriples}
               explodingPairs={config.editor.explodingPairs}
-              codeBlockMatchingPairs={config.editor.codeBlockMatchingPairs}
-              codeBlockMatchingCloseBefore={
-                config.editor.codeBlockMatchingCloseBefore
-              }
-              codeBlockMatchingTriples={config.editor.codeBlockMatchingTriples}
-              codeBlockExplodingPairs={config.editor.codeBlockExplodingPairs}
               scrollPastEnd={config.editor.scrollPastEnd}
               onRef={ref => {
                 this.snippetEditor = ref

browser/main/modals/PreferencesModal/UiTab.js

@@ -124,21 +124,14 @@ class UiTab extends React.Component {
         enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked,
         frontMatterTitleField: this.refs.frontMatterTitleField.value,
         matchingPairs: this.refs.matchingPairs.value,
-        matchingCloseBefore: this.refs.matchingCloseBefore.value,
         matchingTriples: this.refs.matchingTriples.value,
         explodingPairs: this.refs.explodingPairs.value,
-        codeBlockMatchingPairs: this.refs.codeBlockMatchingPairs.value,
-        codeBlockMatchingCloseBefore: this.refs.codeBlockMatchingCloseBefore
-          .value,
-        codeBlockMatchingTriples: this.refs.codeBlockMatchingTriples.value,
-        codeBlockExplodingPairs: this.refs.codeBlockExplodingPairs.value,
         spellcheck: this.refs.spellcheck.checked,
         enableSmartPaste: this.refs.enableSmartPaste.checked,
         enableMarkdownLint: this.refs.enableMarkdownLint.checked,
         customMarkdownLintConfig: this.customMarkdownLintConfigCM
           .getCodeMirror()
           .getValue(),
-        dateFormatISO8601: this.refs.dateFormatISO8601.checked,
         prettierConfig: this.prettierConfigCM.getCodeMirror().getValue(),
         deleteUnusedAttachments: this.refs.deleteUnusedAttachments.checked,
         rtlEnabled: this.refs.rtlEnabled.checked
@@ -752,126 +745,6 @@ class UiTab extends React.Component {
             </div>
           </div>
 
-          <div styleName='group-section'>
-            <div styleName='group-section-label'>
-              {i18n.__('Matching character pairs')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.matchingPairs}
-                ref='matchingPairs'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
-          <div styleName='group-section'>
-            <div styleName='group-section-label-right'>
-              {i18n.__('in code blocks')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.codeBlockMatchingPairs}
-                ref='codeBlockMatchingPairs'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
-          <div styleName='group-section'>
-            <div styleName='group-section-label'>
-              {i18n.__('Close pairs before')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.matchingCloseBefore}
-                ref='matchingCloseBefore'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
-          <div styleName='group-section'>
-            <div styleName='group-section-label-right'>
-              {i18n.__('in code blocks')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.codeBlockMatchingCloseBefore}
-                ref='codeBlockMatchingCloseBefore'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
-          <div styleName='group-section'>
-            <div styleName='group-section-label'>
-              {i18n.__('Matching character triples')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.matchingTriples}
-                ref='matchingTriples'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
-          <div styleName='group-section'>
-            <div styleName='group-section-label-right'>
-              {i18n.__('in code blocks')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.codeBlockMatchingTriples}
-                ref='codeBlockMatchingTriples'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
-          <div styleName='group-section'>
-            <div styleName='group-section-label'>
-              {i18n.__('Exploding character pairs')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.explodingPairs}
-                ref='explodingPairs'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
-          <div styleName='group-section'>
-            <div styleName='group-section-label-right'>
-              {i18n.__('in code blocks')}
-            </div>
-            <div styleName='group-section-control'>
-              <input
-                styleName='group-section-control-input'
-                value={this.state.config.editor.codeBlockExplodingPairs}
-                ref='codeBlockExplodingPairs'
-                onChange={e => this.handleUIChange(e)}
-                type='text'
-              />
-            </div>
-          </div>
-
           <div styleName='group-checkBoxSection'>
             <label>
               <input
@@ -1002,19 +875,50 @@ class UiTab extends React.Component {
             </label>
           </div>
 
-          <div styleName='group-checkBoxSection'>
+          <div styleName='group-section'>
-            <label>
+            <div styleName='group-section-label'>
+              {i18n.__('Matching character pairs')}
+            </div>
+            <div styleName='group-section-control'>
               <input
+                styleName='group-section-control-input'
+                value={this.state.config.editor.matchingPairs}
+                ref='matchingPairs'
                 onChange={e => this.handleUIChange(e)}
-                checked={this.state.config.editor.dateFormatISO8601}
+                type='text'
-                ref='dateFormatISO8601'
-                type='checkbox'
               />
-              &nbsp;
+            </div>
-              {i18n.__('Date shortcut use iso 8601 format')}
-            </label>
           </div>
 
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>
+              {i18n.__('Matching character triples')}
+            </div>
+            <div styleName='group-section-control'>
+              <input
+                styleName='group-section-control-input'
+                value={this.state.config.editor.matchingTriples}
+                ref='matchingTriples'
+                onChange={e => this.handleUIChange(e)}
+                type='text'
+              />
+            </div>
+          </div>
+
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>
+              {i18n.__('Exploding character pairs')}
+            </div>
+            <div styleName='group-section-control'>
+              <input
+                styleName='group-section-control-input'
+                value={this.state.config.editor.explodingPairs}
+                ref='explodingPairs'
+                onChange={e => this.handleUIChange(e)}
+                type='text'
+              />
+            </div>
+          </div>
           <div styleName='group-section'>
             <div styleName='group-section-label'>
               {i18n.__('Custom MarkdownLint Rules')}

extra_scripts/codemirror/addon/edit/closebrackets.js

@@ -1,196 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var defaults = {
-    pairs: "()[]{}''\"\"",
-    closeBefore: ")]}'\":;>",
-    triples: "",
-    explode: "[]{}"
-  };
-
-  var Pos = CodeMirror.Pos;
-
-  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.removeKeyMap(keyMap);
-      cm.state.closeBrackets = null;
-    }
-    if (val) {
-      ensureBound(getOption(val.markdown, "pairs"))
-      cm.state.closeBrackets = val;
-      cm.addKeyMap(keyMap);
-    }
-  });
-
-  function getOption(conf, name) {
-    if (name == "pairs" && typeof conf == "string") return conf;
-    if (typeof conf == "object" && conf[name] != null) return conf[name];
-    return defaults[name];
-  }
-
-  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
-  function ensureBound(chars) {
-    for (var i = 0; i < chars.length; i++) {
-      var ch = chars.charAt(i), key = "'" + ch + "'"
-      if (!keyMap[key]) keyMap[key] = handler(ch)
-    }
-  }
-  ensureBound(defaults.pairs + "`")
-
-  function handler(ch) {
-    return function(cm) { return handleChar(cm, ch); };
-  }
-
-  function getConfig(cm) {
-    var cursor = cm.getCursor();
-    var token = cm.getTokenAt(cursor);
-    var inCodeBlock = !!token.state.fencedEndRE;
-
-    if (inCodeBlock) {
-      return cm.state.closeBrackets.codeBlock
-    } else {
-      return cm.state.closeBrackets.markdown
-    }
-  }
-
-  function handleBackspace(cm) {
-    var conf = getConfig(cm);
-    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
-
-    var pairs = getOption(conf, "pairs");
-    var ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++) {
-      if (!ranges[i].empty()) return CodeMirror.Pass;
-      var around = charsAround(cm, ranges[i].head);
-      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-    }
-    for (var i = ranges.length - 1; i >= 0; i--) {
-      var cur = ranges[i].head;
-      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete");
-    }
-  }
-
-  function handleEnter(cm) {
-    var conf = getConfig(cm);
-    var explode = conf && getOption(conf, "explode");
-    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
-
-    var ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++) {
-      if (!ranges[i].empty()) return CodeMirror.Pass;
-      var around = charsAround(cm, ranges[i].head);
-      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-    }
-    cm.operation(function() {
-      var linesep = cm.lineSeparator() || "\n";
-      cm.replaceSelection(linesep + linesep, null);
-      cm.execCommand("goCharLeft");
-      ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        var line = ranges[i].head.line;
-        cm.indentLine(line, null, true);
-        cm.indentLine(line + 1, null, true);
-      }
-    });
-  }
-
-  function contractSelection(sel) {
-    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
-    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
-            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
-  }
-
-  function handleChar(cm, ch) {
-    var conf = getConfig(cm);
-    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
-
-    var pairs = getOption(conf, "pairs");
-    var pos = pairs.indexOf(ch);
-    if (pos == -1) return CodeMirror.Pass;
-
-    var closeBefore = getOption(conf,"closeBefore");
-
-    var triples = getOption(conf, "triples");
-
-    var identical = pairs.charAt(pos + 1) == ch;
-    var ranges = cm.listSelections();
-    var opening = pos % 2 == 0;
-
-    var type;
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i], cur = range.head, curType;
-      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
-      if (opening && !range.empty()) {
-        curType = "surround";
-      } else if ((identical || !opening) && next == ch) {
-        if (identical && stringStartsAfter(cm, cur))
-          curType = "both";
-        else if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
-          curType = "skipThree";
-        else
-          curType = "skip";
-      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
-                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch) {
-        if (cur.ch > 2 && /\bstring/.test(cm.getTokenTypeAt(Pos(cur.line, cur.ch - 2)))) return CodeMirror.Pass;
-        curType = "addFour";
-      } else if (identical) {
-        var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
-        if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
-        else return CodeMirror.Pass;
-      } else if (opening && (next.length === 0 || /\s/.test(next) || closeBefore.indexOf(next) > -1)) {
-        curType = "both";
-      } else {
-        return CodeMirror.Pass;
-      }
-      if (!type) type = curType;
-      else if (type != curType) return CodeMirror.Pass;
-    }
-
-    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
-    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
-    cm.operation(function() {
-      if (type == "skip") {
-        cm.execCommand("goCharRight");
-      } else if (type == "skipThree") {
-        for (var i = 0; i < 3; i++)
-          cm.execCommand("goCharRight");
-      } else if (type == "surround") {
-        var sels = cm.getSelections();
-        for (var i = 0; i < sels.length; i++)
-          sels[i] = left + sels[i] + right;
-        cm.replaceSelections(sels, "around");
-        sels = cm.listSelections().slice();
-        for (var i = 0; i < sels.length; i++)
-          sels[i] = contractSelection(sels[i]);
-        cm.setSelections(sels);
-      } else if (type == "both") {
-        cm.replaceSelection(left + right, null);
-        cm.triggerElectric(left + right);
-        cm.execCommand("goCharLeft");
-      } else if (type == "addFour") {
-        cm.replaceSelection(left + left + left + left, "before");
-        cm.execCommand("goCharRight");
-      }
-    });
-  }
-
-  function charsAround(cm, pos) {
-    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
-                          Pos(pos.line, pos.ch + 1));
-    return str.length == 2 ? str : null;
-  }
-
-  function stringStartsAfter(cm, pos) {
-    var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
-    return /\bstring/.test(token.type) && token.start == pos.ch &&
-      (pos.ch == 0 || !/\bstring/.test(cm.getTokenTypeAt(pos)))
-  }
-});

extra_scripts/codemirror/mode/bfm/bfm.js

@@ -55,7 +55,9 @@
     }
   }
 
-  CodeMirror.defineMode('bfm', function (config, baseConfig) {
+  CodeMirror.defineMode(
+    'bfm',
+    function(config, baseConfig) {
       baseConfig.name = 'yaml-frontmatter'
       const baseMode = CodeMirror.getMode(config, baseConfig)
 
@@ -86,7 +88,9 @@
             overlayCur: null,
 
             fencedMode: s.fencedMode,
-          fencedState: s.fencedMode ? CodeMirror.copyState(s.fencedMode, s.fencedState) : null,
+            fencedState: s.fencedMode
+              ? CodeMirror.copyState(s.fencedMode, s.fencedState)
+              : null,
 
             fencedEndRE: s.fencedEndRE,
 
@@ -97,28 +101,27 @@
         token: function(stream, state) {
           const initialPos = stream.pos
 
-        if (state.fencedEndRE) {
+          if (state.fencedEndRE && stream.match(state.fencedEndRE)) {
-          if (stream.match(state.fencedEndRE)) {
             state.fencedEndRE = null
             state.fencedMode = null
             state.fencedState = null
 
             stream.pos = initialPos
-          } else if (state.fencedMode) {
-            return state.fencedMode.token(stream, state.fencedState)
           } else {
-            state.overlayCur = this.overlayToken(stream, state)
+            if (state.fencedMode) {
-            state.overlayPos = stream.pos
+              return state.fencedMode.token(stream, state.fencedState)
+            }
 
-            return state.overlayCur
-          }
-        }
-        else {
             const match = stream.match(fencedCodeRE, true)
             if (match) {
               state.fencedEndRE = new RegExp(match[1] + '+ *$')
 
-            state.fencedMode = getMode(match[2], match[3], config, stream.lineOracle.doc.cm)
+              state.fencedMode = getMode(
+                match[2],
+                match[3],
+                config,
+                stream.lineOracle.doc.cm
+              )
               if (state.fencedMode) {
                 state.fencedState = CodeMirror.startState(state.fencedMode)
               }
@@ -127,7 +130,10 @@
             }
           }
 
-        if (stream != state.streamSeen || Math.min(state.basePos, state.overlayPos) < stream.start) {
+          if (
+            stream != state.streamSeen ||
+            Math.min(state.basePos, state.overlayPos) < stream.start
+          ) {
             state.streamSeen = stream
             state.basePos = state.overlayPos = stream.start
           }
@@ -145,21 +151,44 @@
 
           if (state.overlayCur == null) {
             return state.baseCur
-        }
+          } else if (state.baseCur != null && state.combineTokens) {
-        else if (state.baseCur != null && state.combineTokens) {
             return state.baseCur + ' ' + state.overlayCur
-        }
+          } else {
-        else {
             return state.overlayCur
           }
         },
         overlayToken: function(stream, state) {
           state.combineTokens = false
 
+          if (state.fencedEndRE && stream.match(state.fencedEndRE)) {
+            state.fencedEndRE = null
+            state.localMode = null
+            state.localState = null
+
+            return null
+          }
+
           if (state.localMode) {
             return state.localMode.token(stream, state.localState) || ''
           }
 
+          const match = stream.match(fencedCodeRE, true)
+          if (match) {
+            state.fencedEndRE = new RegExp(match[1] + '+ *$')
+
+            state.localMode = getMode(
+              match[2],
+              match[3],
+              config,
+              stream.lineOracle.doc.cm
+            )
+            if (state.localMode) {
+              state.localState = CodeMirror.startState(state.localMode)
+            }
+
+            return null
+          }
+
           state.combineTokens = true
 
           if (state.inTable) {
@@ -210,13 +239,18 @@
           state.inTable = false
 
           if (state.fencedMode) {
-          return state.fencedMode.blankLine && state.fencedMode.blankLine(state.fencedState)
+            return (
+              state.fencedMode.blankLine &&
+              state.fencedMode.blankLine(state.fencedState)
+            )
           } else {
             return baseMode.blankLine(state.baseState)
           }
         }
       }
-  }, 'yaml-frontmatter')
+    },
+    'yaml-frontmatter'
+  )
 
   CodeMirror.defineMIME('text/x-bfm', 'bfm')
 

lib/main.development.html

@@ -116,7 +116,7 @@
   <script src="../extra_scripts/codemirror/mode/gfm/gfm.js"></script>
   <script src="../extra_scripts/codemirror/addon/hyperlink/hyperlink.js"></script>
 
-  <script src="../extra_scripts/codemirror/addon/edit/closebrackets.js"></script>
+  <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
   <script src="../node_modules/codemirror/addon/edit/matchbrackets.js"></script>
 
   <script src="../node_modules/codemirror/addon/search/search.js"></script>

lib/main.production.html

@@ -112,7 +112,7 @@
   <script src="../extra_scripts/codemirror/mode/gfm/gfm.js"></script>
   <script src="../extra_scripts/codemirror/addon/hyperlink/hyperlink.js"></script>
 
-  <script src="../extra_scripts/codemirror/addon/edit/closebrackets.js"></script>
+  <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
   <script src="../node_modules/codemirror/addon/edit/matchbrackets.js"></script>
 
   <script src="../node_modules/codemirror/addon/search/search.js"></script>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "boost",
   "productName": "Boostnote",
-  "version": "0.16.0",
+  "version": "0.15.3",
   "main": "index.js",
   "description": "Boostnote",
   "license": "GPL-3.0",
@@ -186,7 +186,7 @@
     "stylus": "^0.52.4",
     "stylus-loader": "^2.3.1",
     "webpack": "^1.12.2",
-    "webpack-dev-server": "^1.12.0"
+    "webpack-dev-server": "^3.1.11"
   },
   "optionalDependencies": {
     "grunt-electron-installer-debian": "^0.5.0",