From 634a15cfb12687f5db4b88ed37a35d6e6615b80e Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Mon, 23 Apr 2012 10:40:53 -0600 Subject: [PATCH] Move extensions into src/extensions directory --- spec/{app => extensions}/autocomplete-spec.coffee | 0 spec/{app => extensions}/command-interpreter-spec.coffee | 0 spec/{app => extensions}/command-panel-spec.coffee | 0 spec/{app => extensions}/file-finder-spec.coffee | 0 .../{app => }/extensions/strip-trailing-whitespace-spec.coffee | 2 +- spec/{app => extensions}/vim-mode-spec.coffee | 0 src/{app => extensions}/autocomplete.coffee | 0 src/{app => extensions}/command-interpreter.coffee | 2 +- .../command-interpreter/address-range.coffee | 0 src/{app => extensions}/command-interpreter/address.coffee | 0 src/{app => extensions}/command-interpreter/command.coffee | 0 src/{app => extensions/command-interpreter}/commands.pegjs | 0 .../command-interpreter/composite-command.coffee | 0 .../command-interpreter/current-selection-address.coffee | 0 src/{app => extensions}/command-interpreter/eof-address.coffee | 0 .../command-interpreter/line-address.coffee | 0 .../command-interpreter/regex-address.coffee | 0 .../command-interpreter/select-all-matches.coffee | 0 .../command-interpreter/substitution.coffee | 0 src/{app => extensions}/command-panel.coffee | 0 src/{app => extensions}/file-finder.coffee | 0 src/{app => }/extensions/strip-trailing-whitespace.coffee | 0 src/{app => extensions}/vim-mode.coffee | 0 src/{app => extensions}/vim-mode/commands.coffee | 0 src/{app => extensions}/vim-mode/motions.coffee | 0 src/{app => extensions}/vim-mode/operators.coffee | 0 src/stdlib/require.coffee | 3 ++- 27 files changed, 4 insertions(+), 3 deletions(-) rename spec/{app => extensions}/autocomplete-spec.coffee (100%) rename spec/{app => extensions}/command-interpreter-spec.coffee (100%) rename spec/{app => extensions}/command-panel-spec.coffee (100%) rename spec/{app => extensions}/file-finder-spec.coffee (100%) rename spec/{app => }/extensions/strip-trailing-whitespace-spec.coffee (92%) rename spec/{app => extensions}/vim-mode-spec.coffee (100%) rename src/{app => extensions}/autocomplete.coffee (100%) rename src/{app => extensions}/command-interpreter.coffee (78%) rename src/{app => extensions}/command-interpreter/address-range.coffee (100%) rename src/{app => extensions}/command-interpreter/address.coffee (100%) rename src/{app => extensions}/command-interpreter/command.coffee (100%) rename src/{app => extensions/command-interpreter}/commands.pegjs (100%) rename src/{app => extensions}/command-interpreter/composite-command.coffee (100%) rename src/{app => extensions}/command-interpreter/current-selection-address.coffee (100%) rename src/{app => extensions}/command-interpreter/eof-address.coffee (100%) rename src/{app => extensions}/command-interpreter/line-address.coffee (100%) rename src/{app => extensions}/command-interpreter/regex-address.coffee (100%) rename src/{app => extensions}/command-interpreter/select-all-matches.coffee (100%) rename src/{app => extensions}/command-interpreter/substitution.coffee (100%) rename src/{app => extensions}/command-panel.coffee (100%) rename src/{app => extensions}/file-finder.coffee (100%) rename src/{app => }/extensions/strip-trailing-whitespace.coffee (100%) rename src/{app => extensions}/vim-mode.coffee (100%) rename src/{app => extensions}/vim-mode/commands.coffee (100%) rename src/{app => extensions}/vim-mode/motions.coffee (100%) rename src/{app => extensions}/vim-mode/operators.coffee (100%) diff --git a/spec/app/autocomplete-spec.coffee b/spec/extensions/autocomplete-spec.coffee similarity index 100% rename from spec/app/autocomplete-spec.coffee rename to spec/extensions/autocomplete-spec.coffee diff --git a/spec/app/command-interpreter-spec.coffee b/spec/extensions/command-interpreter-spec.coffee similarity index 100% rename from spec/app/command-interpreter-spec.coffee rename to spec/extensions/command-interpreter-spec.coffee diff --git a/spec/app/command-panel-spec.coffee b/spec/extensions/command-panel-spec.coffee similarity index 100% rename from spec/app/command-panel-spec.coffee rename to spec/extensions/command-panel-spec.coffee diff --git a/spec/app/file-finder-spec.coffee b/spec/extensions/file-finder-spec.coffee similarity index 100% rename from spec/app/file-finder-spec.coffee rename to spec/extensions/file-finder-spec.coffee diff --git a/spec/app/extensions/strip-trailing-whitespace-spec.coffee b/spec/extensions/strip-trailing-whitespace-spec.coffee similarity index 92% rename from spec/app/extensions/strip-trailing-whitespace-spec.coffee rename to spec/extensions/strip-trailing-whitespace-spec.coffee index b1058e909..e94c3475e 100644 --- a/spec/app/extensions/strip-trailing-whitespace-spec.coffee +++ b/spec/extensions/strip-trailing-whitespace-spec.coffee @@ -1,4 +1,4 @@ -StripTrailingWhitespace = require 'extensions/strip-trailing-whitespace' +StripTrailingWhitespace = require 'strip-trailing-whitespace' RootView = require 'root-view' fs = require 'fs' diff --git a/spec/app/vim-mode-spec.coffee b/spec/extensions/vim-mode-spec.coffee similarity index 100% rename from spec/app/vim-mode-spec.coffee rename to spec/extensions/vim-mode-spec.coffee diff --git a/src/app/autocomplete.coffee b/src/extensions/autocomplete.coffee similarity index 100% rename from src/app/autocomplete.coffee rename to src/extensions/autocomplete.coffee diff --git a/src/app/command-interpreter.coffee b/src/extensions/command-interpreter.coffee similarity index 78% rename from src/app/command-interpreter.coffee rename to src/extensions/command-interpreter.coffee index 4e412064f..42ad658a4 100644 --- a/src/app/command-interpreter.coffee +++ b/src/extensions/command-interpreter.coffee @@ -4,7 +4,7 @@ PEG = require 'pegjs' module.exports = class CommandInterpreter constructor: -> - @parser = PEG.buildParser(fs.read(require.resolve 'commands.pegjs')) + @parser = PEG.buildParser(fs.read(require.resolve 'command-interpreter/commands.pegjs')) eval: (editor, string) -> command = @parser.parse(string) diff --git a/src/app/command-interpreter/address-range.coffee b/src/extensions/command-interpreter/address-range.coffee similarity index 100% rename from src/app/command-interpreter/address-range.coffee rename to src/extensions/command-interpreter/address-range.coffee diff --git a/src/app/command-interpreter/address.coffee b/src/extensions/command-interpreter/address.coffee similarity index 100% rename from src/app/command-interpreter/address.coffee rename to src/extensions/command-interpreter/address.coffee diff --git a/src/app/command-interpreter/command.coffee b/src/extensions/command-interpreter/command.coffee similarity index 100% rename from src/app/command-interpreter/command.coffee rename to src/extensions/command-interpreter/command.coffee diff --git a/src/app/commands.pegjs b/src/extensions/command-interpreter/commands.pegjs similarity index 100% rename from src/app/commands.pegjs rename to src/extensions/command-interpreter/commands.pegjs diff --git a/src/app/command-interpreter/composite-command.coffee b/src/extensions/command-interpreter/composite-command.coffee similarity index 100% rename from src/app/command-interpreter/composite-command.coffee rename to src/extensions/command-interpreter/composite-command.coffee diff --git a/src/app/command-interpreter/current-selection-address.coffee b/src/extensions/command-interpreter/current-selection-address.coffee similarity index 100% rename from src/app/command-interpreter/current-selection-address.coffee rename to src/extensions/command-interpreter/current-selection-address.coffee diff --git a/src/app/command-interpreter/eof-address.coffee b/src/extensions/command-interpreter/eof-address.coffee similarity index 100% rename from src/app/command-interpreter/eof-address.coffee rename to src/extensions/command-interpreter/eof-address.coffee diff --git a/src/app/command-interpreter/line-address.coffee b/src/extensions/command-interpreter/line-address.coffee similarity index 100% rename from src/app/command-interpreter/line-address.coffee rename to src/extensions/command-interpreter/line-address.coffee diff --git a/src/app/command-interpreter/regex-address.coffee b/src/extensions/command-interpreter/regex-address.coffee similarity index 100% rename from src/app/command-interpreter/regex-address.coffee rename to src/extensions/command-interpreter/regex-address.coffee diff --git a/src/app/command-interpreter/select-all-matches.coffee b/src/extensions/command-interpreter/select-all-matches.coffee similarity index 100% rename from src/app/command-interpreter/select-all-matches.coffee rename to src/extensions/command-interpreter/select-all-matches.coffee diff --git a/src/app/command-interpreter/substitution.coffee b/src/extensions/command-interpreter/substitution.coffee similarity index 100% rename from src/app/command-interpreter/substitution.coffee rename to src/extensions/command-interpreter/substitution.coffee diff --git a/src/app/command-panel.coffee b/src/extensions/command-panel.coffee similarity index 100% rename from src/app/command-panel.coffee rename to src/extensions/command-panel.coffee diff --git a/src/app/file-finder.coffee b/src/extensions/file-finder.coffee similarity index 100% rename from src/app/file-finder.coffee rename to src/extensions/file-finder.coffee diff --git a/src/app/extensions/strip-trailing-whitespace.coffee b/src/extensions/strip-trailing-whitespace.coffee similarity index 100% rename from src/app/extensions/strip-trailing-whitespace.coffee rename to src/extensions/strip-trailing-whitespace.coffee diff --git a/src/app/vim-mode.coffee b/src/extensions/vim-mode.coffee similarity index 100% rename from src/app/vim-mode.coffee rename to src/extensions/vim-mode.coffee diff --git a/src/app/vim-mode/commands.coffee b/src/extensions/vim-mode/commands.coffee similarity index 100% rename from src/app/vim-mode/commands.coffee rename to src/extensions/vim-mode/commands.coffee diff --git a/src/app/vim-mode/motions.coffee b/src/extensions/vim-mode/motions.coffee similarity index 100% rename from src/app/vim-mode/motions.coffee rename to src/extensions/vim-mode/motions.coffee diff --git a/src/app/vim-mode/operators.coffee b/src/extensions/vim-mode/operators.coffee similarity index 100% rename from src/app/vim-mode/operators.coffee rename to src/extensions/vim-mode/operators.coffee diff --git a/src/stdlib/require.coffee b/src/stdlib/require.coffee index 88f4e4080..7babcccf4 100644 --- a/src/stdlib/require.coffee +++ b/src/stdlib/require.coffee @@ -3,6 +3,7 @@ paths = [ "#{atom.loadPath}/benchmark" "#{atom.loadPath}/src/stdlib" "#{atom.loadPath}/src/app" + "#{atom.loadPath}/src/extensions" "#{atom.loadPath}/src" "#{atom.loadPath}/vendor" "#{atom.loadPath}/static" @@ -128,4 +129,4 @@ this.require.nameToUrl = (path) -> "#{path}.js" this.require.__modules = __modules # issue #17 -this.require.noWorker = true \ No newline at end of file +this.require.noWorker = true