diff --git a/spec/atom/app-spec.coffee b/spec/app/atom-spec.coffee similarity index 83% rename from spec/atom/app-spec.coffee rename to spec/app/atom-spec.coffee index cbd8b74a2..57b761cec 100644 --- a/spec/atom/app-spec.coffee +++ b/spec/app/atom-spec.coffee @@ -1,7 +1,7 @@ -App = require 'app' +Atom = require 'atom' fs = require 'fs' -describe "App", -> +describe "Atom", -> closeAllWindows = -> window.close() for window in atom.windows waitsFor "there to be no windows", -> @@ -34,18 +34,18 @@ describe "App", -> expect(newWindow.rootView.activeEditor().buffer.getText()).toEqual fs.read(filePath) describe ".windowOpened(window)", -> - app = null + atom = null beforeEach -> - app = new App + atom = new Atom afterEach -> - app.destroy() + atom.destroy() it "adds the window to the windows array if it isn't already present", -> - app.windowOpened window - app.windowOpened window - expect(app.windows).toEqual [window] + atom.windowOpened window + atom.windowOpened window + expect(atom.windows).toEqual [window] diff --git a/spec/atom/binding-set-spec.coffee b/spec/app/binding-set-spec.coffee similarity index 100% rename from spec/atom/binding-set-spec.coffee rename to spec/app/binding-set-spec.coffee diff --git a/spec/atom/buffer-spec.coffee b/spec/app/buffer-spec.coffee similarity index 100% rename from spec/atom/buffer-spec.coffee rename to spec/app/buffer-spec.coffee diff --git a/spec/atom/command-interpreter-spec.coffee b/spec/app/command-interpreter-spec.coffee similarity index 100% rename from spec/atom/command-interpreter-spec.coffee rename to spec/app/command-interpreter-spec.coffee diff --git a/spec/atom/command-panel-spec.coffee b/spec/app/command-panel-spec.coffee similarity index 100% rename from spec/atom/command-panel-spec.coffee rename to spec/app/command-panel-spec.coffee diff --git a/spec/atom/cursor-spec.coffee b/spec/app/cursor-spec.coffee similarity index 100% rename from spec/atom/cursor-spec.coffee rename to spec/app/cursor-spec.coffee diff --git a/spec/atom/editor-spec.coffee b/spec/app/editor-spec.coffee similarity index 100% rename from spec/atom/editor-spec.coffee rename to spec/app/editor-spec.coffee diff --git a/spec/atom/event-emitter-spec.coffee b/spec/app/event-emitter-spec.coffee similarity index 100% rename from spec/atom/event-emitter-spec.coffee rename to spec/app/event-emitter-spec.coffee diff --git a/spec/atom/file-finder-spec.coffee b/spec/app/file-finder-spec.coffee similarity index 100% rename from spec/atom/file-finder-spec.coffee rename to spec/app/file-finder-spec.coffee diff --git a/spec/atom/highlighter-spec.coffee b/spec/app/highlighter-spec.coffee similarity index 100% rename from spec/atom/highlighter-spec.coffee rename to spec/app/highlighter-spec.coffee diff --git a/spec/atom/keymap-spec.coffee b/spec/app/keymap-spec.coffee similarity index 100% rename from spec/atom/keymap-spec.coffee rename to spec/app/keymap-spec.coffee diff --git a/spec/atom/line-map-spec.coffee b/spec/app/line-map-spec.coffee similarity index 100% rename from spec/atom/line-map-spec.coffee rename to spec/app/line-map-spec.coffee diff --git a/spec/atom/point-spec.coffee b/spec/app/point-spec.coffee similarity index 100% rename from spec/atom/point-spec.coffee rename to spec/app/point-spec.coffee diff --git a/spec/atom/project-spec.coffee b/spec/app/project-spec.coffee similarity index 100% rename from spec/atom/project-spec.coffee rename to spec/app/project-spec.coffee diff --git a/spec/atom/range-spec.coffee b/spec/app/range-spec.coffee similarity index 100% rename from spec/atom/range-spec.coffee rename to spec/app/range-spec.coffee diff --git a/spec/atom/range-spec.js b/spec/app/range-spec.js similarity index 100% rename from spec/atom/range-spec.js rename to spec/app/range-spec.js diff --git a/spec/atom/renderer-spec.coffee b/spec/app/renderer-spec.coffee similarity index 100% rename from spec/atom/renderer-spec.coffee rename to spec/app/renderer-spec.coffee diff --git a/spec/atom/root-view-spec.coffee b/spec/app/root-view-spec.coffee similarity index 100% rename from spec/atom/root-view-spec.coffee rename to spec/app/root-view-spec.coffee diff --git a/spec/atom/screen-line-fragment-spec.coffee b/spec/app/screen-line-fragment-spec.coffee similarity index 100% rename from spec/atom/screen-line-fragment-spec.coffee rename to spec/app/screen-line-fragment-spec.coffee diff --git a/spec/atom/selection-spec.coffee b/spec/app/selection-spec.coffee similarity index 100% rename from spec/atom/selection-spec.coffee rename to spec/app/selection-spec.coffee diff --git a/spec/atom/undo-manager-spec.coffee b/spec/app/undo-manager-spec.coffee similarity index 100% rename from spec/atom/undo-manager-spec.coffee rename to spec/app/undo-manager-spec.coffee diff --git a/spec/atom/vim-mode-spec.coffee b/spec/app/vim-mode-spec.coffee similarity index 100% rename from spec/atom/vim-mode-spec.coffee rename to spec/app/vim-mode-spec.coffee diff --git a/spec/atom/window-spec.coffee b/spec/app/window-spec.coffee similarity index 100% rename from spec/atom/window-spec.coffee rename to spec/app/window-spec.coffee diff --git a/src/atom/ace-outdent-adaptor.coffee b/src/app/ace-outdent-adaptor.coffee similarity index 100% rename from src/atom/ace-outdent-adaptor.coffee rename to src/app/ace-outdent-adaptor.coffee diff --git a/src/atom/anchor.coffee b/src/app/anchor.coffee similarity index 100% rename from src/atom/anchor.coffee rename to src/app/anchor.coffee diff --git a/src/atom/app.coffee b/src/app/atom.coffee similarity index 98% rename from src/atom/app.coffee rename to src/app/atom.coffee index 2fabecd8e..846376994 100644 --- a/src/atom/app.coffee +++ b/src/app/atom.coffee @@ -6,7 +6,7 @@ _ = require 'underscore' require 'underscore-extensions' module.exports = -class App +class Atom keymap: null windows: null tabText: null diff --git a/src/atom/binding-set.coffee b/src/app/binding-set.coffee similarity index 100% rename from src/atom/binding-set.coffee rename to src/app/binding-set.coffee diff --git a/src/atom/buffer.coffee b/src/app/buffer.coffee similarity index 100% rename from src/atom/buffer.coffee rename to src/app/buffer.coffee diff --git a/src/atom/command-interpreter.coffee b/src/app/command-interpreter.coffee similarity index 100% rename from src/atom/command-interpreter.coffee rename to src/app/command-interpreter.coffee diff --git a/src/atom/command-interpreter/address-range.coffee b/src/app/command-interpreter/address-range.coffee similarity index 100% rename from src/atom/command-interpreter/address-range.coffee rename to src/app/command-interpreter/address-range.coffee diff --git a/src/atom/command-interpreter/address.coffee b/src/app/command-interpreter/address.coffee similarity index 100% rename from src/atom/command-interpreter/address.coffee rename to src/app/command-interpreter/address.coffee diff --git a/src/atom/command-interpreter/command.coffee b/src/app/command-interpreter/command.coffee similarity index 100% rename from src/atom/command-interpreter/command.coffee rename to src/app/command-interpreter/command.coffee diff --git a/src/atom/command-interpreter/composite-command.coffee b/src/app/command-interpreter/composite-command.coffee similarity index 100% rename from src/atom/command-interpreter/composite-command.coffee rename to src/app/command-interpreter/composite-command.coffee diff --git a/src/atom/command-interpreter/current-selection-address.coffee b/src/app/command-interpreter/current-selection-address.coffee similarity index 100% rename from src/atom/command-interpreter/current-selection-address.coffee rename to src/app/command-interpreter/current-selection-address.coffee diff --git a/src/atom/command-interpreter/eof-address.coffee b/src/app/command-interpreter/eof-address.coffee similarity index 100% rename from src/atom/command-interpreter/eof-address.coffee rename to src/app/command-interpreter/eof-address.coffee diff --git a/src/atom/command-interpreter/line-address.coffee b/src/app/command-interpreter/line-address.coffee similarity index 100% rename from src/atom/command-interpreter/line-address.coffee rename to src/app/command-interpreter/line-address.coffee diff --git a/src/atom/command-interpreter/regex-address.coffee b/src/app/command-interpreter/regex-address.coffee similarity index 100% rename from src/atom/command-interpreter/regex-address.coffee rename to src/app/command-interpreter/regex-address.coffee diff --git a/src/atom/command-interpreter/select-all-matches.coffee b/src/app/command-interpreter/select-all-matches.coffee similarity index 100% rename from src/atom/command-interpreter/select-all-matches.coffee rename to src/app/command-interpreter/select-all-matches.coffee diff --git a/src/atom/command-interpreter/substitution.coffee b/src/app/command-interpreter/substitution.coffee similarity index 100% rename from src/atom/command-interpreter/substitution.coffee rename to src/app/command-interpreter/substitution.coffee diff --git a/src/atom/command-panel.coffee b/src/app/command-panel.coffee similarity index 100% rename from src/atom/command-panel.coffee rename to src/app/command-panel.coffee diff --git a/src/atom/commands.pegjs b/src/app/commands.pegjs similarity index 100% rename from src/atom/commands.pegjs rename to src/app/commands.pegjs diff --git a/src/atom/composite-cursor.coffee b/src/app/composite-cursor.coffee similarity index 100% rename from src/atom/composite-cursor.coffee rename to src/app/composite-cursor.coffee diff --git a/src/atom/composite-selection.coffee b/src/app/composite-selection.coffee similarity index 100% rename from src/atom/composite-selection.coffee rename to src/app/composite-selection.coffee diff --git a/src/atom/cursor.coffee b/src/app/cursor.coffee similarity index 100% rename from src/atom/cursor.coffee rename to src/app/cursor.coffee diff --git a/src/atom/edit-session.coffee b/src/app/edit-session.coffee similarity index 100% rename from src/atom/edit-session.coffee rename to src/app/edit-session.coffee diff --git a/src/atom/editor.coffee b/src/app/editor.coffee similarity index 100% rename from src/atom/editor.coffee rename to src/app/editor.coffee diff --git a/src/atom/event-emitter.coffee b/src/app/event-emitter.coffee similarity index 100% rename from src/atom/event-emitter.coffee rename to src/app/event-emitter.coffee diff --git a/src/atom/file-finder.coffee b/src/app/file-finder.coffee similarity index 100% rename from src/atom/file-finder.coffee rename to src/app/file-finder.coffee diff --git a/src/atom/fold.coffee b/src/app/fold.coffee similarity index 100% rename from src/atom/fold.coffee rename to src/app/fold.coffee diff --git a/src/atom/gutter.coffee b/src/app/gutter.coffee similarity index 100% rename from src/atom/gutter.coffee rename to src/app/gutter.coffee diff --git a/src/atom/highlighter.coffee b/src/app/highlighter.coffee similarity index 100% rename from src/atom/highlighter.coffee rename to src/app/highlighter.coffee diff --git a/src/atom/keymap.coffee b/src/app/keymap.coffee similarity index 100% rename from src/atom/keymap.coffee rename to src/app/keymap.coffee diff --git a/src/atom/keymaps/apple.coffee b/src/app/keymaps/apple.coffee similarity index 100% rename from src/atom/keymaps/apple.coffee rename to src/app/keymaps/apple.coffee diff --git a/src/atom/keymaps/command-panel.coffee b/src/app/keymaps/command-panel.coffee similarity index 100% rename from src/atom/keymaps/command-panel.coffee rename to src/app/keymaps/command-panel.coffee diff --git a/src/atom/keymaps/editor.coffee b/src/app/keymaps/editor.coffee similarity index 100% rename from src/atom/keymaps/editor.coffee rename to src/app/keymaps/editor.coffee diff --git a/src/atom/keymaps/emacs.coffee b/src/app/keymaps/emacs.coffee similarity index 100% rename from src/atom/keymaps/emacs.coffee rename to src/app/keymaps/emacs.coffee diff --git a/src/atom/keymaps/file-finder.coffee b/src/app/keymaps/file-finder.coffee similarity index 100% rename from src/atom/keymaps/file-finder.coffee rename to src/app/keymaps/file-finder.coffee diff --git a/src/atom/line-map.coffee b/src/app/line-map.coffee similarity index 100% rename from src/atom/line-map.coffee rename to src/app/line-map.coffee diff --git a/src/atom/point.coffee b/src/app/point.coffee similarity index 100% rename from src/atom/point.coffee rename to src/app/point.coffee diff --git a/src/atom/project.coffee b/src/app/project.coffee similarity index 100% rename from src/atom/project.coffee rename to src/app/project.coffee diff --git a/src/atom/range.coffee b/src/app/range.coffee similarity index 100% rename from src/atom/range.coffee rename to src/app/range.coffee diff --git a/src/atom/renderer.coffee b/src/app/renderer.coffee similarity index 100% rename from src/atom/renderer.coffee rename to src/app/renderer.coffee diff --git a/src/atom/root-view.coffee b/src/app/root-view.coffee similarity index 100% rename from src/atom/root-view.coffee rename to src/app/root-view.coffee diff --git a/src/atom/screen-line-fragment.coffee b/src/app/screen-line-fragment.coffee similarity index 100% rename from src/atom/screen-line-fragment.coffee rename to src/app/screen-line-fragment.coffee diff --git a/src/atom/selection.coffee b/src/app/selection.coffee similarity index 100% rename from src/atom/selection.coffee rename to src/app/selection.coffee diff --git a/src/atom/undo-manager.coffee b/src/app/undo-manager.coffee similarity index 100% rename from src/atom/undo-manager.coffee rename to src/app/undo-manager.coffee diff --git a/src/atom/vim-mode.coffee b/src/app/vim-mode.coffee similarity index 100% rename from src/atom/vim-mode.coffee rename to src/app/vim-mode.coffee diff --git a/src/atom/vim-mode/commands.coffee b/src/app/vim-mode/commands.coffee similarity index 100% rename from src/atom/vim-mode/commands.coffee rename to src/app/vim-mode/commands.coffee diff --git a/src/atom/vim-mode/motions.coffee b/src/app/vim-mode/motions.coffee similarity index 100% rename from src/atom/vim-mode/motions.coffee rename to src/app/vim-mode/motions.coffee diff --git a/src/atom/vim-mode/operators.coffee b/src/app/vim-mode/operators.coffee similarity index 100% rename from src/atom/vim-mode/operators.coffee rename to src/app/vim-mode/operators.coffee diff --git a/src/atom/window.coffee b/src/app/window.coffee similarity index 100% rename from src/atom/window.coffee rename to src/app/window.coffee diff --git a/src/atom-bootstrap.coffee b/src/atom-bootstrap.coffee index 1f7905381..ca1409857 100644 --- a/src/atom-bootstrap.coffee +++ b/src/atom-bootstrap.coffee @@ -1,2 +1,2 @@ -App = require 'app' -window.atom = new App(atom.loadPath, $native) +Atom = require 'atom' +window.atom = new Atom(atom.loadPath, $native) diff --git a/src/stdlib/require.coffee b/src/stdlib/require.coffee index 6c6eb4b60..88f4e4080 100644 --- a/src/stdlib/require.coffee +++ b/src/stdlib/require.coffee @@ -2,7 +2,7 @@ paths = [ "#{atom.loadPath}/spec" "#{atom.loadPath}/benchmark" "#{atom.loadPath}/src/stdlib" - "#{atom.loadPath}/src/atom" + "#{atom.loadPath}/src/app" "#{atom.loadPath}/src" "#{atom.loadPath}/vendor" "#{atom.loadPath}/static" @@ -110,7 +110,8 @@ __read = (path) -> try $native.read(path) catch e - throw "require: can't read #{path}" + console.error "Failed to read `#{path}`" + throw e __modules = { loaded : {} } __defines = [] @@ -127,4 +128,4 @@ this.require.nameToUrl = (path) -> "#{path}.js" this.require.__modules = __modules # issue #17 -this.require.noWorker = true +this.require.noWorker = true \ No newline at end of file