Merge branch 'master' of github.com:github/atom

2026-04-06 03:02:13 -04:00 · 2012-04-03 15:01:34 -06:00
parent d521dab2cf 1efb712fd3
commit 3a8c444e1f
75 changed files with 24 additions and 16 deletions
--- a/Atom/src/client_handler.mm
+++ b/Atom/src/client_handler.mm
@@ -211,7 +211,7 @@ bool ClientHandler::OnConsoleMessage(CefRefPtr<CefBrowser> browser,
 {
  REQUIRE_UI_THREAD();
  
-  std::cout << std::string(message) << "\n";
+  std::cout << std::string(message) << "\n\t" << std::string(source) << ":" << line;
  
  return true;
 }
--- a/index.html
+++ b/index.html
@@ -4,8 +4,15 @@

  <script>
    window.onload = function() {
-      if ($bootstrapScript) require($bootstrapScript);
+      try {
+        if ($bootstrapScript) require($bootstrapScript);
+      }
+      catch (error) {
+        $native.showDevTools()
+        console.error(error.stack)
+      }
    }
+
  </script>
 </head>
 <body>
--- a/spec/app/atom-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]



--- a/spec/atom/binding-set-spec.coffee
+++ b/spec/atom/binding-set-spec.coffee
--- a/spec/atom/buffer-spec.coffee
+++ b/spec/atom/buffer-spec.coffee
--- a/spec/atom/command-interpreter-spec.coffee
+++ b/spec/atom/command-interpreter-spec.coffee
--- a/spec/atom/command-panel-spec.coffee
+++ b/spec/atom/command-panel-spec.coffee
--- a/spec/atom/cursor-spec.coffee
+++ b/spec/atom/cursor-spec.coffee
--- a/spec/atom/editor-spec.coffee
+++ b/spec/atom/editor-spec.coffee
--- a/spec/atom/event-emitter-spec.coffee
+++ b/spec/atom/event-emitter-spec.coffee
--- a/spec/atom/file-finder-spec.coffee
+++ b/spec/atom/file-finder-spec.coffee
--- a/spec/atom/highlighter-spec.coffee
+++ b/spec/atom/highlighter-spec.coffee
--- a/spec/atom/keymap-spec.coffee
+++ b/spec/atom/keymap-spec.coffee
--- a/spec/atom/line-map-spec.coffee
+++ b/spec/atom/line-map-spec.coffee
--- a/spec/atom/point-spec.coffee
+++ b/spec/atom/point-spec.coffee
--- a/spec/atom/project-spec.coffee
+++ b/spec/atom/project-spec.coffee
--- a/spec/atom/range-spec.coffee
+++ b/spec/atom/range-spec.coffee
--- a/spec/atom/range-spec.js
+++ b/spec/atom/range-spec.js
--- a/spec/atom/renderer-spec.coffee
+++ b/spec/atom/renderer-spec.coffee
--- a/spec/atom/root-view-spec.coffee
+++ b/spec/atom/root-view-spec.coffee
--- a/spec/atom/screen-line-fragment-spec.coffee
+++ b/spec/atom/screen-line-fragment-spec.coffee
--- a/spec/atom/selection-spec.coffee
+++ b/spec/atom/selection-spec.coffee
--- a/spec/atom/undo-manager-spec.coffee
+++ b/spec/atom/undo-manager-spec.coffee
--- a/spec/atom/vim-mode-spec.coffee
+++ b/spec/atom/vim-mode-spec.coffee
--- a/spec/atom/window-spec.coffee
+++ b/spec/atom/window-spec.coffee
--- a/src/atom/ace-outdent-adaptor.coffee
+++ b/src/atom/ace-outdent-adaptor.coffee
--- a/src/atom/anchor.coffee
+++ b/src/atom/anchor.coffee
--- a/src/app/atom.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
--- a/src/atom/binding-set.coffee
+++ b/src/atom/binding-set.coffee
--- a/src/atom/buffer.coffee
+++ b/src/atom/buffer.coffee
--- a/src/atom/command-interpreter.coffee
+++ b/src/atom/command-interpreter.coffee
--- a/src/atom/command-interpreter/address-range.coffee
+++ b/src/atom/command-interpreter/address-range.coffee
--- a/src/atom/command-interpreter/address.coffee
+++ b/src/atom/command-interpreter/address.coffee
--- a/src/atom/command-interpreter/command.coffee
+++ b/src/atom/command-interpreter/command.coffee
--- a/src/atom/command-interpreter/composite-command.coffee
+++ b/src/atom/command-interpreter/composite-command.coffee
--- a/src/atom/command-interpreter/current-selection-address.coffee
+++ b/src/atom/command-interpreter/current-selection-address.coffee
--- a/src/atom/command-interpreter/eof-address.coffee
+++ b/src/atom/command-interpreter/eof-address.coffee
--- a/src/atom/command-interpreter/line-address.coffee
+++ b/src/atom/command-interpreter/line-address.coffee
--- a/src/atom/command-interpreter/regex-address.coffee
+++ b/src/atom/command-interpreter/regex-address.coffee
--- a/src/atom/command-interpreter/select-all-matches.coffee
+++ b/src/atom/command-interpreter/select-all-matches.coffee
--- a/src/atom/command-interpreter/substitution.coffee
+++ b/src/atom/command-interpreter/substitution.coffee
--- a/src/atom/command-panel.coffee
+++ b/src/atom/command-panel.coffee
--- a/src/atom/commands.pegjs
+++ b/src/atom/commands.pegjs
--- a/src/atom/composite-cursor.coffee
+++ b/src/atom/composite-cursor.coffee
--- a/src/atom/composite-selection.coffee
+++ b/src/atom/composite-selection.coffee
--- a/src/atom/cursor.coffee
+++ b/src/atom/cursor.coffee
--- a/src/atom/edit-session.coffee
+++ b/src/atom/edit-session.coffee
--- a/src/atom/editor.coffee
+++ b/src/atom/editor.coffee
--- a/src/atom/event-emitter.coffee
+++ b/src/atom/event-emitter.coffee
--- a/src/atom/file-finder.coffee
+++ b/src/atom/file-finder.coffee
--- a/src/atom/fold.coffee
+++ b/src/atom/fold.coffee
--- a/src/atom/gutter.coffee
+++ b/src/atom/gutter.coffee
--- a/src/atom/highlighter.coffee
+++ b/src/atom/highlighter.coffee
--- a/src/atom/keymap.coffee
+++ b/src/atom/keymap.coffee
--- a/src/atom/keymaps/apple.coffee
+++ b/src/atom/keymaps/apple.coffee
--- a/src/atom/keymaps/command-panel.coffee
+++ b/src/atom/keymaps/command-panel.coffee
--- a/src/atom/keymaps/editor.coffee
+++ b/src/atom/keymaps/editor.coffee
--- a/src/atom/keymaps/emacs.coffee
+++ b/src/atom/keymaps/emacs.coffee
--- a/src/atom/keymaps/file-finder.coffee
+++ b/src/atom/keymaps/file-finder.coffee
--- a/src/atom/line-map.coffee
+++ b/src/atom/line-map.coffee
--- a/src/atom/point.coffee
+++ b/src/atom/point.coffee
--- a/src/atom/project.coffee
+++ b/src/atom/project.coffee
--- a/src/atom/range.coffee
+++ b/src/atom/range.coffee
--- a/src/atom/renderer.coffee
+++ b/src/atom/renderer.coffee
--- a/src/atom/root-view.coffee
+++ b/src/atom/root-view.coffee
--- a/src/atom/screen-line-fragment.coffee
+++ b/src/atom/screen-line-fragment.coffee
--- a/src/atom/selection.coffee
+++ b/src/atom/selection.coffee
--- a/src/atom/undo-manager.coffee
+++ b/src/atom/undo-manager.coffee
--- a/src/atom/vim-mode.coffee
+++ b/src/atom/vim-mode.coffee
--- a/src/atom/vim-mode/commands.coffee
+++ b/src/atom/vim-mode/commands.coffee
--- a/src/atom/vim-mode/motions.coffee
+++ b/src/atom/vim-mode/motions.coffee
--- a/src/atom/vim-mode/operators.coffee
+++ b/src/atom/vim-mode/operators.coffee
--- a/src/atom/window.coffee
+++ b/src/atom/window.coffee
--- 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)
--- 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