From b7b30e67482beca0bd1f92c11aba062cfb8a7227 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 10:16:17 -0700 Subject: [PATCH 01/10] Add missing pegjs dependency --- .gitignore | 1 + package.json | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 .gitignore 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/package.json b/package.json index b8873290..fd834136 100644 --- a/package.json +++ b/package.json @@ -15,5 +15,8 @@ }, "publishConfig": { "registry": "https://atom.iriscouch.com/registry/_design/app/_rewrite" + }, + "dependencies": { + "pegjs": "~0.7.0" } } From 42b76bf6aca5fa7ba76995d147c501856c4c130b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 10:16:36 -0700 Subject: [PATCH 02/10] Remove unused requires --- spec/snippets-spec.coffee | 3 --- 1 file changed, 3 deletions(-) diff --git a/spec/snippets-spec.coffee b/spec/snippets-spec.coffee index a0612d0f..68e61782 100644 --- a/spec/snippets-spec.coffee +++ b/spec/snippets-spec.coffee @@ -1,10 +1,7 @@ Snippet = require '../lib/snippet' Snippets = require '../lib/snippets' RootView = require 'root-view' -Buffer = require 'text-buffer' -Editor = require 'editor' _ = require 'underscore' -Package = require 'package' describe "Snippets extension", -> [buffer, editor, editSession] = [] From c41fc2a0f6aa5351cd5ab6bba83b8688066f2dd8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 10:22:17 -0700 Subject: [PATCH 03/10] Add missing season and async dependencies --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index fd834136..ea9434a4 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,8 @@ "registry": "https://atom.iriscouch.com/registry/_design/app/_rewrite" }, "dependencies": { - "pegjs": "~0.7.0" + "pegjs": "~0.7.0", + "async": "~0.2.9", + "season": "~0.12.0" } } From 670df5e3a4dc4140960ab47523b6789fa9947c5e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 10:22:39 -0700 Subject: [PATCH 04/10] Use atom-api for requires --- lib/snippet-body-parser.coffee | 2 +- lib/snippet-expansion.coffee | 3 +-- lib/snippet.coffee | 2 +- lib/snippets.coffee | 8 ++------ spec/snippets-spec.coffee | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/snippet-body-parser.coffee b/lib/snippet-body-parser.coffee index 15e6bb28..42832810 100644 --- a/lib/snippet-body-parser.coffee +++ b/lib/snippet-body-parser.coffee @@ -1,4 +1,4 @@ PEG = require 'pegjs' -fsUtils = require 'fs-utils' +{fs} = require 'atom-api' grammarSrc = fsUtils.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..7e96dbf7 100644 --- a/lib/snippet-expansion.coffee +++ b/lib/snippet-expansion.coffee @@ -1,5 +1,4 @@ -Subscriber = require 'subscriber' -_ = require 'underscore' +{_, Subscriber} = require 'atom-api' module.exports = class SnippetExpansion diff --git a/lib/snippet.coffee b/lib/snippet.coffee index f817dd3a..85983483 100644 --- a/lib/snippet.coffee +++ b/lib/snippet.coffee @@ -1,4 +1,4 @@ -_ = require 'underscore' +{_} = require 'atom-api' {Range} = require 'telepath' module.exports = diff --git a/lib/snippets.coffee b/lib/snippets.coffee index cf0f417a..77f98c35 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-api' path = require 'path' -_ = require 'underscore' SnippetExpansion = require './snippet-expansion' Snippet = require './snippet' -TextMatePackage = require 'text-mate-package' CSON = require 'season' async = require 'async' @@ -30,7 +26,7 @@ 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) diff --git a/spec/snippets-spec.coffee b/spec/snippets-spec.coffee index 68e61782..934491e9 100644 --- a/spec/snippets-spec.coffee +++ b/spec/snippets-spec.coffee @@ -1,7 +1,6 @@ Snippet = require '../lib/snippet' Snippets = require '../lib/snippets' -RootView = require 'root-view' -_ = require 'underscore' +{_, RootView} = require 'atom-api' describe "Snippets extension", -> [buffer, editor, editSession] = [] From 51c42f2d4fbec5324adbae54bb43689a3e7bfb9f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 10:35:20 -0700 Subject: [PATCH 05/10] Rename fsUtils to fs --- lib/snippet-body-parser.coffee | 2 +- lib/snippets.coffee | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/snippet-body-parser.coffee b/lib/snippet-body-parser.coffee index 42832810..5ac8becc 100644 --- a/lib/snippet-body-parser.coffee +++ b/lib/snippet-body-parser.coffee @@ -1,4 +1,4 @@ PEG = require 'pegjs' {fs} = require 'atom-api' -grammarSrc = fsUtils.read(require.resolve('./snippet-body.pegjs')) +grammarSrc = fs.read(require.resolve('./snippet-body.pegjs')) module.exports = PEG.buildParser(grammarSrc, trackLineAndColumn: true) diff --git a/lib/snippets.coffee b/lib/snippets.coffee index 77f98c35..b21f06f0 100644 --- a/lib/snippets.coffee +++ b/lib/snippets.coffee @@ -33,7 +33,7 @@ module.exports = 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 @@ -50,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 @@ -61,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) From 684d70ea5c600f38145db2bf8124a25845be2045 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 10:38:29 -0700 Subject: [PATCH 06/10] Guard against possibly missing function --- lib/snippets.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/snippets.coffee b/lib/snippets.coffee index b21f06f0..e84c636e 100644 --- a/lib/snippets.coffee +++ b/lib/snippets.coffee @@ -26,7 +26,7 @@ module.exports = @loaded = true loadSnippetsFromPackage: (pack, done) -> - if pack.getType() is 'textmate' + if pack.getType?() is 'textmate' @loadTextMateSnippets(pack.path, done) else @loadAtomSnippets(pack.path, done) From e4847d298b24af6440c63e43f7e946ca1ca05829 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 11:27:26 -0700 Subject: [PATCH 07/10] Require Range from atom-api --- lib/snippet.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/snippet.coffee b/lib/snippet.coffee index 85983483..ec756940 100644 --- a/lib/snippet.coffee +++ b/lib/snippet.coffee @@ -1,5 +1,4 @@ -{_} = require 'atom-api' -{Range} = require 'telepath' +{_, Range} = require 'atom-api' module.exports = class Snippet From ebe2826af6d4772e4678842744f2503ef9fcd4ab Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 13:33:10 -0700 Subject: [PATCH 08/10] Rename require from atom-api to atom --- lib/snippet-body-parser.coffee | 2 +- lib/snippet-expansion.coffee | 2 +- lib/snippet.coffee | 2 +- lib/snippets.coffee | 2 +- spec/snippets-spec.coffee | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/snippet-body-parser.coffee b/lib/snippet-body-parser.coffee index 5ac8becc..0d2c9d64 100644 --- a/lib/snippet-body-parser.coffee +++ b/lib/snippet-body-parser.coffee @@ -1,4 +1,4 @@ PEG = require 'pegjs' -{fs} = require 'atom-api' +{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 7e96dbf7..6b5ff762 100644 --- a/lib/snippet-expansion.coffee +++ b/lib/snippet-expansion.coffee @@ -1,4 +1,4 @@ -{_, Subscriber} = require 'atom-api' +{_, Subscriber} = require 'atom' module.exports = class SnippetExpansion diff --git a/lib/snippet.coffee b/lib/snippet.coffee index ec756940..4effe229 100644 --- a/lib/snippet.coffee +++ b/lib/snippet.coffee @@ -1,4 +1,4 @@ -{_, Range} = require 'atom-api' +{_, Range} = require 'atom' module.exports = class Snippet diff --git a/lib/snippets.coffee b/lib/snippets.coffee index e84c636e..298ac5c5 100644 --- a/lib/snippets.coffee +++ b/lib/snippets.coffee @@ -1,4 +1,4 @@ -{_, fs} = require 'atom-api' +{_, fs} = require 'atom' path = require 'path' SnippetExpansion = require './snippet-expansion' Snippet = require './snippet' diff --git a/spec/snippets-spec.coffee b/spec/snippets-spec.coffee index 934491e9..d1a0f07f 100644 --- a/spec/snippets-spec.coffee +++ b/spec/snippets-spec.coffee @@ -1,6 +1,6 @@ Snippet = require '../lib/snippet' Snippets = require '../lib/snippets' -{_, RootView} = require 'atom-api' +{_, RootView} = require 'atom' describe "Snippets extension", -> [buffer, editor, editSession] = [] From 8b42e7ea4903b1314991515e15676fbd5fcd48bb Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 19 Sep 2013 17:06:16 -0700 Subject: [PATCH 09/10] Lock async version to 0.2.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea9434a4..33d5219f 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "pegjs": "~0.7.0", - "async": "~0.2.9", + "async": "0.2.6", "season": "~0.12.0" } } From d086c0e138fbaef06182867f707cd58d6b5d6d30 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 20 Sep 2013 10:12:44 -0700 Subject: [PATCH 10/10] Back out new package.json dependencies --- package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package.json b/package.json index 33d5219f..b8873290 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,5 @@ }, "publishConfig": { "registry": "https://atom.iriscouch.com/registry/_design/app/_rewrite" - }, - "dependencies": { - "pegjs": "~0.7.0", - "async": "0.2.6", - "season": "~0.12.0" } }