diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..3c3629e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules diff --git a/lib/snippet-body-parser.coffee b/lib/snippet-body-parser.coffee index 15e6bb28..0d2c9d64 100644 --- a/lib/snippet-body-parser.coffee +++ b/lib/snippet-body-parser.coffee @@ -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) diff --git a/lib/snippet-expansion.coffee b/lib/snippet-expansion.coffee index 1b187ebb..6b5ff762 100644 --- a/lib/snippet-expansion.coffee +++ b/lib/snippet-expansion.coffee @@ -1,5 +1,4 @@ -Subscriber = require 'subscriber' -_ = require 'underscore' +{_, Subscriber} = require 'atom' module.exports = class SnippetExpansion diff --git a/lib/snippet.coffee b/lib/snippet.coffee index f817dd3a..4effe229 100644 --- a/lib/snippet.coffee +++ b/lib/snippet.coffee @@ -1,5 +1,4 @@ -_ = require 'underscore' -{Range} = require 'telepath' +{_, Range} = require 'atom' module.exports = class Snippet diff --git a/lib/snippets.coffee b/lib/snippets.coffee index cf0f417a..298ac5c5 100644 --- a/lib/snippets.coffee +++ b/lib/snippets.coffee @@ -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' @@ -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 @@ -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 @@ -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) diff --git a/spec/snippets-spec.coffee b/spec/snippets-spec.coffee index a0612d0f..d1a0f07f 100644 --- a/spec/snippets-spec.coffee +++ b/spec/snippets-spec.coffee @@ -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] = []