Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
4 changes: 2 additions & 2 deletions lib/snippet-body-parser.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PEG = require 'pegjs'
fsUtils = require 'fs-utils'
grammarSrc = fsUtils.read(require.resolve('./snippet-body.pegjs'))
{fs} = require 'atom'
grammarSrc = fs.read(require.resolve('./snippet-body.pegjs'))
module.exports = PEG.buildParser(grammarSrc, trackLineAndColumn: true)
3 changes: 1 addition & 2 deletions lib/snippet-expansion.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Subscriber = require 'subscriber'
_ = require 'underscore'
{_, Subscriber} = require 'atom'

module.exports =
class SnippetExpansion
Expand Down
3 changes: 1 addition & 2 deletions lib/snippet.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
_ = require 'underscore'
{Range} = require 'telepath'
{_, Range} = require 'atom'

module.exports =
class Snippet
Expand Down
14 changes: 5 additions & 9 deletions lib/snippets.coffee
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
AtomPackage = require 'atom-package'
fs = require 'fs'
fsUtils = require 'fs-utils'
{_, fs} = require 'atom'
path = require 'path'
_ = require 'underscore'
SnippetExpansion = require './snippet-expansion'
Snippet = require './snippet'
TextMatePackage = require 'text-mate-package'
CSON = require 'season'
async = require 'async'

Expand All @@ -30,14 +26,14 @@ module.exports =
@loaded = true

loadSnippetsFromPackage: (pack, done) ->
if pack instanceof TextMatePackage
if pack.getType?() is 'textmate'
@loadTextMateSnippets(pack.path, done)
else
@loadAtomSnippets(pack.path, done)

loadAtomSnippets: (packagePath, done) ->
snippetsDirPath = path.join(packagePath, 'snippets')
return done() unless fsUtils.isDirectorySync(snippetsDirPath)
return done() unless fs.isDirectorySync(snippetsDirPath)

loadSnippetFile = (filename, done) =>
return done() if filename.indexOf('.') is 0
Expand All @@ -54,7 +50,7 @@ module.exports =

loadTextMateSnippets: (bundlePath, done) ->
snippetsDirPath = path.join(bundlePath, 'Snippets')
return done() unless fsUtils.isDirectorySync(snippetsDirPath)
return done() unless fs.isDirectorySync(snippetsDirPath)

loadSnippetFile = (filename, done) =>
return done() if filename.indexOf('.') is 0
Expand All @@ -65,7 +61,7 @@ module.exports =
console.warn "Error reading snippets file '#{filepath}': #{err.stack ? err}"

try
fsUtils.readObject filepath, (err, object) =>
fs.readObject filepath, (err, object) =>
try
if err
logError(err)
Expand Down
6 changes: 1 addition & 5 deletions spec/snippets-spec.coffee
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Snippet = require '../lib/snippet'
Snippets = require '../lib/snippets'
RootView = require 'root-view'
Buffer = require 'text-buffer'
Editor = require 'editor'
_ = require 'underscore'
Package = require 'package'
{_, RootView} = require 'atom'

describe "Snippets extension", ->
[buffer, editor, editSession] = []
Expand Down