Finish decaf snippets.coffee

Author: Aerijo

lib/snippets.js

@@ -311,8 +311,7 @@ module.exports = {
     })
   },
 
-  add (filePath, snippetsBySelector, isDisabled) {
-    if (isDisabled == null) { isDisabled = false }
+  add (filePath, snippetsBySelector, isDisabled = false) {
     for (let selector in snippetsBySelector) {
       const snippetsByName = snippetsBySelector[selector]
       const unparsedSnippetsByPrefix = {}
@@ -323,7 +322,7 @@ module.exports = {
         attributes.id = this.snippetIdCounter++
         if (typeof body === 'string') {
           unparsedSnippetsByPrefix[prefix] = attributes
-        } else if ((body == null)) {
+        } else if (body == null) {
           unparsedSnippetsByPrefix[prefix] = null
         }
       }
@@ -333,32 +332,29 @@ module.exports = {
   },
 
   addSnippetsInDisabledPackage (bundle) {
-    return (() => {
-      const result = []
-      for (let filePath in bundle) {
-        const snippetsBySelector = bundle[filePath]
-        result.push(this.add(filePath, snippetsBySelector, true))
-      }
-      return result
-    })()
+    for (let filePath in bundle) {
+      const snippetsBySelector = bundle[filePath]
+      this.add(filePath, snippetsBySelector, true)
+    }
   },
 
   getScopeChain (object) {
-    let scopesArray = __guardMethod__(object, 'getScopesArray', o => o.getScopesArray())
-    if (scopesArray == null) { scopesArray = object }
+    let scopesArray = object
+    if (object && object.getScopesArray) {
+      scopesArray = object.getScopesArray()
+    }
+
     return scopesArray
-      .map(function(scope) {
-        if (scope[0] !== '.') { scope = `.${scope}` }
-        return scope}).join(' ')
+      .map(scope => scope[0] === '.' ? scope : `.${scope}`)
+      .join(' ')
   },
 
-  storeUnparsedSnippets (value, path, selector, isDisabled) {
+  storeUnparsedSnippets (value, path, selector, isDisabled = false) {
     // The `isDisabled` flag determines which scoped property store we'll use.
     // Active snippets get put into one and inactive snippets get put into
     // another. Only the first one gets consulted when we look up a snippet
     // prefix for expansion, but both stores have their contents exported when
     // the settings view asks for all available snippets.
-    if (isDisabled == null) { isDisabled = false }
     const unparsedSnippets = {}
     unparsedSnippets[selector] = {"snippets": value}
     const store = isDisabled ? this.disabledSnippetsScopedPropertyStore : this.scopedPropertyStore
@@ -378,14 +374,20 @@ module.exports = {
   },
 
   parsedSnippetsForScopes (scopeDescriptor) {
-    let attributes, prefix, unparsedLegacySnippetsByPrefix
+    let attributes
+    let prefix
+    let unparsedLegacySnippetsByPrefix
+
     const unparsedSnippetsByPrefix = this.scopedPropertyStore.getPropertyValue(
       this.getScopeChain(scopeDescriptor),
       "snippets"
     )
 
-    const legacyScopeDescriptor = typeof atom.config.getLegacyScopeDescriptorForNewScopeDescriptor === 'function' ? atom.config.getLegacyScopeDescriptorForNewScopeDescriptor(scopeDescriptor) : undefined
-    if (legacyScopeDescriptor != null) {
+    const legacyScopeDescriptor = atom.config.getLegacyScopeDescriptorForNewScopeDescriptor
+      ? atom.config.getLegacyScopeDescriptorForNewScopeDescriptor(scopeDescriptor)
+      : undefined
+
+    if (legacyScopeDescriptor) {
       unparsedLegacySnippetsByPrefix = this.scopedPropertyStore.getPropertyValue(
         this.getScopeChain(legacyScopeDescriptor),
         "snippets"
@@ -394,18 +396,18 @@ module.exports = {
 
     const snippets = {}
 
-    if (unparsedSnippetsByPrefix != null) {
+    if (unparsedSnippetsByPrefix) {
       for (prefix in unparsedSnippetsByPrefix) {
         attributes = unparsedSnippetsByPrefix[prefix]
         if (typeof (attributes != null ? attributes.body : undefined) !== 'string') { continue }
         snippets[prefix] = this.getParsedSnippet(attributes)
       }
     }
 
-    if (unparsedLegacySnippetsByPrefix != null) {
+    if (unparsedLegacySnippetsByPrefix) {
       for (prefix in unparsedLegacySnippetsByPrefix) {
         attributes = unparsedLegacySnippetsByPrefix[prefix]
-        if (snippets[prefix] != null) { continue }
+        if (snippets[prefix]) { continue }
         if (typeof (attributes != null ? attributes.body : undefined) !== 'string') { continue }
         snippets[prefix] = this.getParsedSnippet(attributes)
       }
@@ -447,9 +449,11 @@ module.exports = {
   // Returns `null` if the values aren't the same for all cursors
   getPrefixText (snippets, editor) {
     const wordRegex = this.wordRegexForSnippets(snippets)
-    let [snippetPrefix, wordPrefix] = Array.from([])
 
-    for (let cursor of Array.from(editor.getCursors())) {
+    let snippetPrefix = null
+    let wordPrefix = null
+
+    for (let cursor of editor.getCursors()) {
       const position = cursor.getBufferPosition()
 
       const prefixStart = cursor.getBeginningOfCurrentWordBufferPosition({wordRegex})
@@ -471,7 +475,7 @@ module.exports = {
     const prefixes = {}
 
     for (let prefix in snippets) {
-      for (let character of Array.from(prefix)) { prefixes[character] = true }
+      for (let character of prefix) { prefixes[character] = true }
     }
 
     const prefixCharacters = Object.keys(prefixes).join('')
@@ -500,33 +504,29 @@ module.exports = {
   },
 
   snippetToExpandUnderCursor (editor) {
-    let prefixData
     if (!editor.getLastSelection().isEmpty()) { return false }
     const snippets = this.getSnippets(editor)
     if (_.isEmpty(snippets)) { return false }
 
-    if (prefixData = this.getPrefixText(snippets, editor)) {
+    let prefixData = this.getPrefixText(snippets, editor)
+    if (prefixData) {
       return this.snippetForPrefix(snippets, prefixData.snippetPrefix, prefixData.wordPrefix)
     }
   },
 
   expandSnippetsUnderCursors (editor) {
-    let snippet
-    if (!(snippet = this.snippetToExpandUnderCursor(editor))) { return false }
+    let snippet = this.snippetToExpandUnderCursor(editor)
+    if (!snippet) { return false }
 
     this.getStore(editor).observeHistory({
-      undo: event => {
-        return this.onUndoOrRedo(editor, event, true)
-      },
-      redo: event => {
-        return this.onUndoOrRedo(editor, event, false)
-      }
+      undo: event => { this.onUndoOrRedo(editor, event, true) },
+      redo: event => { this.onUndoOrRedo(editor, event, false) }
     })
 
     this.findOrCreateMarkerLayer(editor)
     editor.transact(() => {
       const cursors = editor.getCursors()
-      for (let cursor of Array.from(cursors)) {
+      for (let cursor of cursors) {
         const cursorPosition = cursor.getBufferPosition()
         const startPoint = cursorPosition.translate([0, -snippet.prefix.length], [0, 0])
         cursor.selection.setBufferRange([startPoint, cursorPosition])
@@ -538,7 +538,7 @@ module.exports = {
 
   goToNextTabStop (editor) {
     let nextTabStopVisited = false
-    for (let expansion of Array.from(this.getExpansions(editor))) {
+    for (let expansion of this.getExpansions(editor)) {
       if (expansion != null ? expansion.goToNextTabStop() : undefined) {
         nextTabStopVisited = true
       }
@@ -548,7 +548,7 @@ module.exports = {
 
   goToPreviousTabStop (editor) {
     let previousTabStopVisited = false
-    for (let expansion of Array.from(this.getExpansions(editor))) {
+    for (let expansion of this.getExpansions(editor)) {
       if (expansion != null ? expansion.goToPreviousTabStop() : undefined) {
         previousTabStopVisited = true
       }
@@ -560,13 +560,13 @@ module.exports = {
     return EditorStore.findOrCreate(editor)
   },
 
-  createMarkerLayer (editor) {
-    return this.editorMarkerLayers.set(editor, editor.addMarkerLayer({maintainHistory: true}))
-  },
+  // createMarkerLayer (editor) {
+  //   this.editorMarkerLayers.set(editor, editor.addMarkerLayer({maintainHistory: true}))
+  // },
 
   findOrCreateMarkerLayer (editor) {
     let layer = this.editorMarkerLayers.get(editor)
-    if (layer == null) {
+    if (layer === undefined) {
       layer = editor.addMarkerLayer({maintainHistory: true})
       this.editorMarkerLayers.set(editor, layer)
     }
@@ -583,11 +583,11 @@ module.exports = {
     // There are no more active instances of this expansion, so we should undo
     // the spying we set up on this editor.
     store.stopObserving()
-    return store.stopObservingHistory()
+    store.stopObservingHistory()
   },
 
   addExpansion (editor, snippetExpansion) {
-    return this.getStore(editor).addExpansion(snippetExpansion)
+    this.getStore(editor).addExpansion(snippetExpansion)
   },
 
   textChanged (editor, event) {
@@ -598,36 +598,34 @@ module.exports = {
 
     this.ignoringTextChangesForEditor(editor, () =>
       editor.transact(() =>
-        Array.from(activeExpansions).map((expansion) =>
+        activeExpansions.map(expansion =>
           expansion.textChanged(event))
       )
     )
 
     // Create a checkpoint here to consolidate all the changes we just made into
     // the transaction that prompted them.
-    return this.makeCheckpoint(editor)
+    this.makeCheckpoint(editor)
   },
 
   // Perform an action inside the editor without triggering our `textChanged`
   // callback.
   ignoringTextChangesForEditor (editor, callback) {
     this.stopObservingEditor(editor)
     callback()
-    return this.observeEditor(editor)
+    this.observeEditor(editor)
   },
 
   observeEditor (editor) {
-    return this.getStore(editor).observe(event => {
-      return this.textChanged(editor, event)
-    })
+    this.getStore(editor).observe(event => this.textChanged(editor, event))
   },
 
   stopObservingEditor (editor) {
-    return this.getStore(editor).stopObserving()
+    this.getStore(editor).stopObserving()
   },
 
   makeCheckpoint (editor) {
-    return this.getStore(editor).makeCheckpoint()
+    this.getStore(editor).makeCheckpoint()
   },
 
   insert (snippet, editor, cursor) {
@@ -642,22 +640,18 @@ module.exports = {
 
   getUnparsedSnippets () {
     const results = []
-    const iterate = sets =>
-      (() => {
-        const result = []
-        for (let item of Array.from(sets)) {
-          const newItem = _.deepClone(item)
-          // The atom-slick library has already parsed the `selector` property, so
-          // it's an AST here instead of a string. The object has a `toString`
-          // method that turns it back into a string. That custom behavior won't
-          // be preserved in the deep clone of the object, so we have to handle it
-          // separately.
-          newItem.selectorString = item.selector.toString()
-          result.push(results.push(newItem))
-        }
-        return result
-      })()
-
+    const iterate = sets => {
+      for (let item of sets) {
+        const newItem = _.deepClone(item)
+        // The atom-slick library has already parsed the `selector` property, so
+        // it's an AST here instead of a string. The object has a `toString`
+        // method that turns it back into a string. That custom behavior won't
+        // be preserved in the deep clone of the object, so we have to handle it
+        // separately.
+        newItem.selectorString = item.selector.toString()
+        results.push(newItem)
+      }
+    }
 
     iterate(this.scopedPropertyStore.propertySets)
     iterate(this.disabledSnippetsScopedPropertyStore.propertySets)
@@ -676,15 +670,6 @@ module.exports = {
 
   onUndoOrRedo (editor, isUndo) {
     const activeExpansions = this.getExpansions(editor)
-    return Array.from(activeExpansions).map((expansion) =>
-      expansion.onUndoOrRedo(isUndo))
+    activeExpansions.forEach(expansion => expansion.onUndoOrRedo(isUndo))
   }
 }
-
-function __guardMethod__ (obj, methodName, transform) {
-  if (typeof obj !== 'undefined' && obj !== null && typeof obj[methodName] === 'function') {
-    return transform(obj, methodName)
-  } else {
-    return undefined
-  }
-}