Remove outdated section of the creating-a-package docs

Improve reporting of display buffer errors

docs/building-atom.md

@@ -1,34 +0,0 @@
-## Building Atom
-
-These guide is meant only for users who wish to help develop atom core,
-if you're just interested in using atom you should just [download
-atom][download].
-
-## OSX
-
-* Use OS X 10.8 or later
-* Install the latest node 0.10.x release (32bit preferable)
-* Clone [atom][atom-git] to `~/github/atom`
-* Run `~/github/atom/script/build`
-
-## Windows
-
-* Install [Visual C++ 2010 Express][win-vs2010]
-* Install the [latest 32bit Node 0.10.x][win-node]
-* Install the [latest Python 2.7.x][win-python]
-* Install [GitHub for Windows][win-github]
-* Clone [atom/atom][atom-git] to `C:\Users\<user>\github\atom\`
-* Add `C:\Python27;C:\Program Files\nodejs;C:\Users\<user>\github\atom\node_modules\`
-  to your PATH
-* Set ATOM_ACCESS_TOKEN to your oauth2 credentials (run `security -q
-  find-generic-password -ws 'GitHub API Token'` on OSX to get your
-  credentials).
-* Use the Windows GitHub shell and cd into `C:\Users\<user>\github\atom`
-* Run `script\bootstrap`
-
-[download]: https://github.com/atom/atom/releases/latest
-[win-node]: http://nodejs.org/download/
-[win-python]: http://www.python.org/download/
-[win-github]: http://windows.github.com/
-[win-vs2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
-[atom-git]: https://github.com/atom/atom/

docs/converting-a-text-mate-bundle.md

@@ -40,7 +40,7 @@ the editor to see it in action!
 
 ### Further Reading
 
-* Check out [Publishing a Package](publish-a-package.html) for more information
+* Check out [Publishing a Package](publishing-a-package.html) for more information
   on publishing the package you just created to [atom.io][atomio].
 
 [atomio]: https://atom.io

docs/converting-a-text-mate-theme.md

@@ -57,7 +57,7 @@ __Syntax Theme__ dropdown menu to enable your new theme.
 
 ### Further Reading
 
-* Check out [Publishing a Package](publish-a-package.html) for more information
+* Check out [Publishing a Package](publishing-a-package.html) for more information
   on publishing the theme you just created to [atom.io][atomio].
 
 [atomio]: https://atom.io

docs/creating-a-package.md

@@ -24,6 +24,9 @@ Not every package will have (or need) all of these directories.
 
 We have [a tutorial on creating your first package][first-package].
 
+There are also guides for converting [TextMate bundles][convert-bundle] and
+[TextMate themes][convert-theme] so they work in Atom.
+
 ## package.json
 
 Similar to [npm packages][npm], Atom packages contain a _package.json_ file
@@ -322,23 +325,16 @@ Your package **should** have tests, and if they're placed in the _spec_
 directory, they can be run by Atom.
 
 Under the hood, [Jasmine] executes your tests, so you can assume that any DSL
-available there is available to your package as well.
-
-**FIXME: Explain the following**
-
-* jasmine
-* jasmine-focused
-* `spec/fixtures` and global.project
-* setTimeout
-* whatever else is different in spec-helper
+available there is also available to your package.
 
 ## Running Tests
 
-TODO: Probably use the menu option now.
+Once you've got your test suite written, you can run it by pressing
+`cmd-alt-ctrl-p` or via the _Developer > Run Package Specs_ menu.
 
-Once you've got your test suite written, the recommended way to run it is `apm
-test`. `apm test` prints its output to the console and returns the proper status
-code depending on whether tests passed or failed.
+You can also use the `apm test` command to run them from the command line. It
+prints the test output and results to the console and returns the proper status
+code depending on whether the tests passed or failed.
 
 ## Publishing
 
@@ -359,37 +355,3 @@ registry.
 
 Run `apm help publish` to see all the available options and `apm help` to see
 all the other available commands.
-
-## Included Libraries
-
-FIXME: Describe `require 'atom'
-
-In addition to core node.js modules, all packages can `require` the following
-popular libraries into their packages:
-
-* [SpacePen] (as `require 'space-pen'`)
-* [jQuery] (as `require 'jquery'`)
-* [Underscore] (as `require 'underscore'`)
-
-Additional libraries can be found by browsing Atom's *node_modules* folder.
-
-[file-tree]: https://github.com/atom/tree-view
-[status-bar]: https://github.com/atom/status-bar
-[cs-syntax]: https://github.com/atom/language-coffee-script
-[npm]: http://en.wikipedia.org/wiki/Npm_(software)
-[npm-keys]: https://npmjs.org/doc/json.html
-[apm]: https://github.com/atom/apm
-[git-tag]: http://git-scm.com/book/en/Git-Basics-Tagging
-[wrap-guide]: https://github.com/atom/wrap-guide/
-[keymaps]: advanced/keymaps.md
-[theme-variables]: theme-variables.md
-[tm-tokens]: http://manual.macromates.com/en/language_grammars.html
-[spacepen]: https://github.com/nathansobo/space-pen
-[path]: http://nodejs.org/docs/latest/api/path.html
-[jquery]: http://jquery.com/
-[underscore]: http://underscorejs.org/
-[jasmine]: https://github.com/pivotal/jasmine
-[cson]: https://github.com/atom/season
-[less]: http://lesscss.org
-[ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/stylesheets/ui-variables.less
-[first-package]: your-first-package.html

docs/customizing-atom.md

@@ -144,7 +144,7 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
 When Atom finishes loading, it will evaluate _init.coffee_ in your _~/.atom_
 directory, giving you a chance to run arbitrary personal CoffeeScript code to
 make customizations. You have full access to Atom's API from code in this file.
-If customizations become extensive, consider [creating a package][create-a-package].
+If customizations become extensive, consider [creating a package][creating-a-package].
 
 You can open this file in an editor from the _Atom > Open Your Init Script_
 menu.
@@ -172,6 +172,6 @@ Unfamiliar with LESS? Read more about it [here][LESS].
 
 This file can also be named _styles.css_ and contain CSS.
 
-[create-a-package]: creating-packages.md
+[creating-a-package]: creating-a-package.md
 [create-theme]: creating-a-theme.md
 [LESS]: http://www.lesscss.org

docs/getting-started.md

@@ -74,7 +74,7 @@ You can split any editor pane horizontally or vertically by using `cmd-k right`
 or `cmd-k down`. Once you have a split pane, you can move focus between them
 with `cmd-k cmd-right` or `cmd-k cmd-down`. To close a pane, close all its
 editors with `meta-w`, then press `meta-w` one more time to close the pane. You
-can configure panes to auto-close with empty in the preferences.
+can configure panes to auto-close when empty in the Settings view.
 
 ### Folding
 
@@ -95,7 +95,7 @@ in preferences.
 
 ## Configuration
 
-Press `cmd-,` to open the Settings view. This is the place to change settings
+Press `cmd-,` to open the Settings view. This is the place to change settings,
 install packages, and change the theme.
 
 For more advanced configuration see the [customization guide][customization].

docs/index.md

@@ -5,6 +5,8 @@
 * [Creating a Package](creating-a-package.md)
 * [Creating a Theme](creating-a-theme.md)
 * [Publishing a Package](publishing-a-package.md)
+* [Converting a TextMate Bundle](converting-a-text-mate-bundle.md)
+* [Converting a TextMate Theme](converting-a-text-mate-theme.md)
 * [Contributing](contributing.md)
 
 ### Advanced Topics

docs/setting-up-travis.md

@@ -1,39 +0,0 @@
-# Setting up Travis CI
-
-Packages under the [atom org][atom-org] should use [Travis CI][travis-ci] for
-builds.
-
-Currently we have a [Travis Pro][travis-pro] account since the repositories
-are private.  This process will be simpler and have fewer steps once the
-package repos are made public.
-
-Each package builds using the [build-package][build-package] script, any
-changes to the build should be made in that script and will affect all
-package builds immediately.
-
-Each package builds against the latest successful build of atom@master. The
-master builds are stored in the [atom-master-builds][atom-master-builds] repo
-as releases named by the SHA-1 built.
-
-## Configuring a package
-
-* Run `cd ~/github/my-package` to navigate to the package repo locally
-* Run `apm test` to verify that the package currently builds via [apm][apm]
-* Add the package repo to the [Travis CI team][travis-ci-team]
-* Run `gem install travis` to install the [travis gem][travis-gem]
-* Run `travis login --pro` and log in using the [atom-build][atom-build] user
-  and the password from the *Shared-Developers* folder in LastPass
-* Run `apm ci` to add a `.travis.yml` file to the repo and to configure Travis
-* Log into [Travis][travis-ci] as the `atom-build` user and you should now see
-  the package listed and building
-  
-
-[apm]: https://github.com/atom/apm
-[build-package]: https://github.com/atom/apm/blob/master/script/build-package
-[atom-build]: https://github.com/atom-build
-[atom-master-builds]: https://github.com/atom/atom-master-builds/releases
-[atom-org]: https://github.com/atom
-[travis-ci]: https://magnum.travis-ci.com
-[travis-ci-team]: https://github.com/organizations/atom/teams/596636
-[travis-gem]: https://rubygems.org/gems/travis
-[travis-pro]: http://about.travis-ci.org/docs/user/travis-pro

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.55.0",
+  "version": "0.61.0",
   "main": "./src/browser/main.js",
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.10.1",
+  "atomShellVersion": "0.10.3",
   "dependencies": {
     "async": "0.2.6",
     "bootstrap": "git://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
@@ -28,7 +28,7 @@
     "first-mate": ">=1.1.5 <2.0",
     "fs-plus": "2.x",
     "fstream": "0.1.24",
-    "fuzzaldrin": "1.x",
+    "fuzzaldrin": "~1.1",
     "git-utils": "1.x",
     "guid": "0.0.10",
     "jasmine-tagged": ">=1.1.1 <2.0",
@@ -73,36 +73,36 @@
     "bracket-matcher": "0.22.0",
     "command-palette": "0.18.0",
     "dev-live-reload": "0.28.0",
-    "exception-reporting": "0.15.0",
-    "feedback": "0.26.0",
+    "exception-reporting": "0.16.0",
+    "feedback": "0.27.0",
     "find-and-replace": "0.85.0",
     "fuzzy-finder": "0.37.0",
     "git-diff": "0.25.0",
-    "go-to-line": "0.17.0",
+    "go-to-line": "0.18.0",
     "grammar-selector": "0.21.0",
     "image-view": "0.25.0",
     "keybinding-resolver": "0.11.0",
     "link": "0.18.0",
-    "markdown-preview": "0.37.0",
-    "metrics": "0.28.0",
+    "markdown-preview": "0.40.0",
+    "metrics": "0.30.0",
     "open-on-github": "0.21.0",
     "package-generator": "0.28.0",
-    "release-notes": "0.24.0",
-    "settings-view": "0.82.0",
+    "release-notes": "0.25.0",
+    "settings-view": "0.85.0",
     "snippets": "0.32.0",
     "spell-check": "0.26.0",
     "status-bar": "0.33.0",
-    "styleguide": "0.25.0",
-    "symbols-view": "0.38.0",
+    "styleguide": "0.26.0",
+    "symbols-view": "0.39.0",
     "tabs": "0.24.0",
     "timecop": "0.15.0",
     "tree-view": "0.71.0",
     "update-package-dependencies": "0.4.0",
-    "welcome": "0.6.0",
+    "welcome": "0.10.0",
     "whitespace": "0.15.0",
-    "wrap-guide": "0.15.0",
+    "wrap-guide": "0.16.0",
     "language-c": "0.12.0",
-    "language-coffee-script": "0.12.0",
+    "language-coffee-script": "0.14.0",
     "language-css": "0.10.0",
     "language-gfm": "0.18.0",
     "language-git": "0.9.0",
@@ -110,10 +110,10 @@
     "language-html": "0.8.0",
     "language-hyperlink": "0.8.0",
     "language-java": "0.8.0",
-    "language-javascript": "0.11.0",
+    "language-javascript": "0.12.0",
     "language-json": "0.8.0",
-    "language-less": "0.5.0",
-    "language-make": "0.8.0",
+    "language-less": "0.6.0",
+    "language-make": "0.9.0",
     "language-objective-c": "0.9.0",
     "language-perl": "0.8.0",
     "language-php": "0.8.0",

resources/mac/atom-Info.plist

@@ -25,7 +25,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
+	<string>10.8</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>

spec/project-spec.coffee

@@ -491,6 +491,16 @@ describe "Project", ->
           expect(resultForA.matches).toHaveLength 1
           expect(resultForA.matches[0].matchText).toBe 'Elephant'
 
+      it "ignores buffers outside the project", ->
+        editor = atom.project.openSync(temp.openSync().path)
+        editor.setText("Elephant")
+        results = []
+        waitsForPromise ->
+          atom.project.scan /Elephant/, (result) -> results.push result
+
+        runs ->
+          expect(results).toHaveLength 0
+
   describe ".eachBuffer(callback)", ->
     beforeEach ->
       atom.project.bufferForPathSync('a')

src/browser/atom-application.coffee

@@ -141,7 +141,7 @@ class AtomApplication
       @applicationMenu.showCheckForUpdateItem(true)
 
     autoUpdater.on 'update-downloaded', (event, releaseNotes, releaseName, releaseDate, releaseURL) =>
-      atomWindow.sendCommand('window:update-available', releaseName) for atomWindow in @windows
+      atomWindow.sendCommand('window:update-available', [releaseName, releaseNotes]) for atomWindow in @windows
       @applicationMenu.showInstallUpdateItem(true)
       @applicationMenu.showCheckForUpdateItem(false)
       @updateVersion = releaseName

src/display-buffer.coffee

@@ -10,6 +10,11 @@ Fold = require './fold'
 Token = require './token'
 DisplayBufferMarker = require './display-buffer-marker'
 
+class BufferToScreenConversionError extends Error
+  constructor: (@message, @metadata) ->
+    super
+    Error.captureStackTrace(this, BufferToScreenConversionError)
+
 module.exports =
 class DisplayBuffer extends Model
   Serializable.includeInto(this)
@@ -291,13 +296,15 @@ class DisplayBuffer extends Model
     { row, column } = @buffer.clipPosition(bufferPosition)
     [startScreenRow, endScreenRow] = @rowMap.screenRowRangeForBufferRow(row)
     for screenRow in [startScreenRow...endScreenRow]
-      unless screenLine = @screenLines[screenRow]
-        throw new Error """
-          No screen line exists for screen row #{screenRow}, converted from buffer position (#{row}, #{column})
-          Soft wrap enabled: #{@getSoftWrap()}
-          Fold count: #{@findFoldMarkers().length}
-          Last buffer row: #{@getLastRow()}
-        """
+      screenLine = @screenLines[screenRow]
+
+      unless screenLine?
+        throw new BufferToScreenConversionError "No screen line exists when converting buffer row to screen row",
+          softWrapEnabled: @getSoftWrap()
+          foldCount: @findFoldMarkers().length
+          lastBufferRow: @buffer.getLastRow()
+          lastScreenRow: @getLastRow()
+
       maxBufferColumn = screenLine.getMaxBufferColumn()
       if screenLine.isSoftWrapped() and column > maxBufferColumn
         continue

src/editor-view.coffee

@@ -27,7 +27,7 @@ class EditorView extends View
   @characterWidthCache: {}
   @configDefaults:
     fontFamily: ''
-    fontSize: 20
+    fontSize: 16
     showInvisibles: false
     showIndentGuide: false
     showLineNumbers: true

src/project.coffee

@@ -189,8 +189,8 @@ class Project extends Model
   #
   # Returns a promise that resolves to the {TextBuffer}.
   buildBuffer: (absoluteFilePath) ->
-    if fs.getSizeSync(absoluteFilePath) >= 1048576 # 1MB
-      throw new Error("Atom can only handle files < 1MB, for now.")
+    if fs.getSizeSync(absoluteFilePath) >= 2 * 1048576 # 2MB
+      throw new Error("Atom can only handle files < 2MB, for now.")
 
     buffer = new TextBuffer({filePath: absoluteFilePath})
     @addBuffer(buffer)
@@ -251,6 +251,7 @@ class Project extends Model
 
     for buffer in @getBuffers() when buffer.isModified()
       filePath = buffer.getPath()
+      continue unless @contains(filePath)
       matches = []
       buffer.scan regex, (match) -> matches.push match
       iterator {filePath, matches} if matches.length > 0

static/panes.less

@@ -24,6 +24,7 @@
     display: -webkit-flex;
     -webkit-flex: 1;
     -webkit-flex-direction: column;
+    overflow: hidden;
 
     .item-views {
       -webkit-flex: 1;