Go back to strict-ssl false

This is until we can get npm upgraded there.

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/creating-a-theme.md

@@ -32,14 +32,15 @@ Let's create your first theme.
 
 To get started, hit `cmd-shift-P`, and start typing "Generate Syntax Theme" to
 generate a new theme package. Select "Generate Syntax Theme," and you'll be
-asked for the path where your theme will be created. Let's call ours _motif_.
+asked for the path where your theme will be created. Let's call ours
+_motif-syntax_. __Tip:__ syntax themes should end with _-syntax_.
 
-Atom will pop open a new window, showing the _motif_ theme, with a default set
-of folders and files created for us. If you open the settings view (`cmd-,`)
-and navigate to the _Themes_ section on the left, you'll see the _Motif_ theme
-listed in the _Syntax Theme_ drop-down. Select it from the menu to activate it,
-now when you open an editor you should see that your new _motif_ theme in
-action.
+Atom will pop open a new window, showing the _motif-syntax_ theme, with a
+default set of folders and files created for us. If you open the settings view
+(`cmd-,`) and navigate to the _Themes_ section on the left, you'll see the
+_Motif_ theme listed in the _Syntax Theme_ drop-down. Select it from the menu to
+activate it, now when you open an editor you should see that your new
+_motif-syntax_ theme in action.
 
 Open up _stylesheets/colors.less_ to change the various colors variables which
 have been already been defined. For example, turn `@red` into `#f4c2c1`.
@@ -53,6 +54,11 @@ As an example, let's make the `.gutter` `background-color` into `@red`.
 Reload Atom by pressing `cmd-alt-option-L` to see the changes you made reflected
 in your Atom window. Pretty neat!
 
+__Tip:__ You can avoid reloading to see changes you make by opening an atom
+window in dev mode. To open a Dev Mode Atom window run `atom --dev .` in the
+terminal, use `cmd-shift-o` or use the _View > Developer > Open in Dev Mode_
+menu. When you edit your theme, changes will instantly be reflected!
+
 ## Creating an Interface Theme
 
 Interface themes **must** provide a `ui-variables.less` file which contains all
@@ -66,13 +72,14 @@ To create an interface UI theme, do the following:
 2. Clone the forked repository to the local filesystem
 3. Open a terminal in the forked theme's directory
 4. Open your new theme in a Dev Mode Atom window run `atom --dev .` in the
-   terminal or use the _View > Developer > Open in Dev Mode_ menu)
+   terminal or use the _View > Developer > Open in Dev Mode_ menu
 5. Change the name of the theme in the theme's `package.json` file
-6. Run `apm link` to symlink your repository to `~/.atom/packages`
-7. Reload Atom using `cmd-alt-ctrl-L`
-8. Enable the theme via _UI Theme_ drop-down in the _Themes_ section of the
+6. Name your theme end with a `-ui`. i.e. `super-white-ui`
+7. Run `apm link` to symlink your repository to `~/.atom/packages`
+8. Reload Atom using `cmd-alt-ctrl-L`
+9. Enable the theme via _UI Theme_ drop-down in the _Themes_ section of the
    settings view
-9. Make changes! Since you opened the theme in a Dev Mode window, changes will
+10. Make changes! Since you opened the theme in a Dev Mode window, changes will
    be instantly reflected in the editor without having to reload.
 
 ## Development workflow

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/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

keymaps/darwin.cson

@@ -133,7 +133,7 @@
   'ctrl-cmd-up': 'editor:move-line-up'
   'ctrl-cmd-down': 'editor:move-line-down'
   'cmd-/': 'editor:toggle-line-comments'
-  'cmd-j': 'editor:join-line'
+  'cmd-j': 'editor:join-lines'
   'cmd-D': 'editor:duplicate-line'
   'cmd-L': 'editor:split-selections-into-lines'
 

keymaps/win32.cson

@@ -80,7 +80,7 @@
   'ctrl-up': 'editor:move-line-up'
   'ctrl-down': 'editor:move-line-down'
   'ctrl-/': 'editor:toggle-line-comments'
-  'ctrl-j': 'editor:join-line'
+  'ctrl-j': 'editor:join-lines'
   'ctrl-D': 'editor:duplicate-line'
 
   'ctrl-alt-[': 'editor:fold-current-row'

menus/darwin.cson

@@ -66,7 +66,7 @@
           { label: 'Move Line Down', command: 'editor:move-line-down' }
           { label: 'Duplicate Line', command: 'editor:duplicate-line' }
           { label: 'Delete Line', command: 'editor:delete-line' }
-          { label: 'Join Lines', command: 'editor:join-line' }
+          { label: 'Join Lines', command: 'editor:join-lines' }
         ]
       }
       {

menus/win32.cson

@@ -45,7 +45,7 @@
           { label: 'Move Line &Down', command: 'editor:move-line-down' }
           { label: 'Du&plicate Line', command: 'editor:duplicate-line' }
           { label: 'D&elete Line', command: 'editor:delete-line' }
-          { label: '&Join Lines', command: 'editor:join-line' }
+          { label: '&Join Lines', command: 'editor:join-lines' }
         ]
       }
       {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.59.0",
+  "version": "0.62.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",
@@ -53,7 +53,7 @@
     "temp": "0.5.0",
     "text-buffer": ">=1.1.2 <2.0",
     "theorist": "1.x",
-    "underscore-plus": "1.x",
+    "underscore-plus": ">=1.0.2 <2.0",
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
@@ -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",
+    "exception-reporting": "0.16.0",
     "feedback": "0.27.0",
-    "find-and-replace": "0.85.0",
+    "find-and-replace": "0.86.0",
     "fuzzy-finder": "0.37.0",
     "git-diff": "0.25.0",
-    "go-to-line": "0.17.0",
-    "grammar-selector": "0.21.0",
+    "go-to-line": "0.18.0",
+    "grammar-selector": "0.22.0",
     "image-view": "0.25.0",
     "keybinding-resolver": "0.11.0",
-    "link": "0.18.0",
-    "markdown-preview": "0.37.0",
+    "link": "0.19.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",
+    "package-generator": "0.29.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.40.0",
     "tabs": "0.24.0",
     "timecop": "0.15.0",
-    "tree-view": "0.71.0",
+    "tree-view": "0.72.0",
     "update-package-dependencies": "0.4.0",
-    "welcome": "0.9.0",
+    "welcome": "0.11.0",
     "whitespace": "0.15.0",
-    "wrap-guide": "0.15.0",
+    "wrap-guide": "0.16.0",
     "language-c": "0.12.0",
-    "language-coffee-script": "0.13.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>

script/bootstrap

@@ -31,10 +31,10 @@ var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 var commands = [
   'git submodule --quiet sync',
   'git submodule --quiet update --recursive --init',
-  {command: 'npm install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
-  {command: 'npm install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
-  {command: 'npm install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
-  {command: 'npm install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
+  {command: 'npm --strict-ssl=false install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
+  {command: 'npm --strict-ssl=false install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
+  {command: 'npm --strict-ssl=false install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
+  {command: 'npm --strict-ssl=false install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
   {command: 'node ../../apm/node_modules/atom-package-manager/bin/apm rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}},
   echoNewLine,
   'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,

spec/display-buffer-spec.coffee

@@ -37,7 +37,7 @@ describe "DisplayBuffer", ->
       expect(displayBuffer2.isFoldedAtBufferRow(3)).toBeTruthy()
 
       # can diverge from origin
-      displayBuffer2.destroyFoldsContainingBufferRow(3)
+      displayBuffer2.unfoldBufferRow(3)
       expect(displayBuffer2.isFoldedAtBufferRow(3)).not.toBe displayBuffer.isFoldedAtBufferRow(3)
 
   describe "when the buffer changes", ->
@@ -495,7 +495,7 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.bufferPositionForScreenPosition([5, 0])).toEqual [5, 0]
         expect(displayBuffer.bufferPositionForScreenPosition([9, 2])).toEqual [9, 2]
 
-    describe ".destroyFoldsContainingBufferRow(row)", ->
+    describe ".unfoldBufferRow(row)", ->
       it "destroys all folds containing the given row", ->
         displayBuffer.createFold(2, 4)
         displayBuffer.createFold(2, 6)
@@ -506,7 +506,7 @@ describe "DisplayBuffer", ->
         expect(displayBuffer.lineForRow(1).text).toBe '1'
         expect(displayBuffer.lineForRow(2).text).toBe '10'
 
-        displayBuffer.destroyFoldsContainingBufferRow(2)
+        displayBuffer.unfoldBufferRow(2)
         expect(displayBuffer.lineForRow(1).text).toBe '1'
         expect(displayBuffer.lineForRow(2).text).toBe '2'
         expect(displayBuffer.lineForRow(7).fold).toBeDefined()
@@ -684,7 +684,7 @@ describe "DisplayBuffer", ->
         }
         markerChangedHandler.reset()
 
-        displayBuffer.destroyFoldsContainingBufferRow(4)
+        displayBuffer.unfoldBufferRow(4)
         expect(markerChangedHandler).toHaveBeenCalled()
         expect(markerChangedHandler.argsForCall[0][0]).toEqual {
           oldHeadScreenPosition: [8, 23]
@@ -867,7 +867,7 @@ describe "DisplayBuffer", ->
           expect(marker.getHeadScreenPosition()).toEqual [8, 10]
           expect(marker.getTailScreenPosition()).toEqual [8, 4]
 
-        displayBuffer.destroyFoldsContainingBufferRow(4)
+        displayBuffer.unfoldBufferRow(4)
 
         expect(changeHandler).toHaveBeenCalled()
         expect(markerChangedHandler).toHaveBeenCalled()

spec/editor-spec.coffee

@@ -2635,18 +2635,18 @@ describe "Editor", ->
         editor.destroy()
         expect(buffer.getMarkerCount()).toBe 0
 
-    describe ".joinLine()", ->
+    describe ".joinLines()", ->
       describe "when no text is selected", ->
         describe "when the line below isn't empty", ->
           it "joins the line below with the current line separated by a space and moves the cursor to the start of line that was moved up", ->
-            editor.joinLine()
+            editor.joinLines()
             expect(editor.lineForBufferRow(0)).toBe 'var quicksort = function () { var sort = function(items) {'
             expect(editor.getCursorBufferPosition()).toEqual [0, 30]
 
         describe "when the line below is empty", ->
           it "deletes the line below and moves the cursor to the end of the line", ->
             editor.setCursorBufferPosition([9])
-            editor.joinLine()
+            editor.joinLines()
             expect(editor.lineForBufferRow(9)).toBe '  };'
             expect(editor.lineForBufferRow(10)).toBe '  return sort(Array.apply(this, arguments));'
             expect(editor.getCursorBufferPosition()).toEqual [9, 4]
@@ -2654,21 +2654,21 @@ describe "Editor", ->
         describe "when the cursor is on the last row", ->
           it "does nothing", ->
             editor.setCursorBufferPosition([Infinity, Infinity])
-            editor.joinLine()
+            editor.joinLines()
             expect(editor.lineForBufferRow(12)).toBe '};'
 
       describe "when text is selected", ->
         describe "when the selection does not span multiple lines", ->
           it "joins the line below with the current line separated by a space and retains the selected text", ->
             editor.setSelectedBufferRange([[0, 1], [0, 3]])
-            editor.joinLine()
+            editor.joinLines()
             expect(editor.lineForBufferRow(0)).toBe 'var quicksort = function () { var sort = function(items) {'
             expect(editor.getSelectedBufferRange()).toEqual [[0, 1], [0, 3]]
 
         describe "when the selection spans multiple lines", ->
           it "joins all selected lines separated by a space and retains the selected text", ->
             editor.setSelectedBufferRange([[9, 3], [12, 1]])
-            editor.joinLine()
+            editor.joinLines()
             expect(editor.lineForBufferRow(9)).toBe '  }; return sort(Array.apply(this, arguments)); };'
             expect(editor.getSelectedBufferRange()).toEqual [[9, 3], [9, 49]]
 

spec/language-mode-spec.coffee

@@ -285,21 +285,6 @@ describe "LanguageMode", ->
           expect(fold.getStartRow()).toBe 0
           expect(fold.getEndRow()).toBe 13
 
-    describe ".unfoldBufferRow(bufferRow)", ->
-      describe "when bufferRow can be unfolded", ->
-        it "destroys a fold based on the syntactic region starting at the given row", ->
-          languageMode.foldBufferRow(1)
-          expect(editor.lineForScreenRow(1).fold).toBeDefined()
-
-          languageMode.unfoldBufferRow(1)
-          expect(editor.lineForScreenRow(1).fold).toBeUndefined()
-
-      describe "when bufferRow can't be unfolded", ->
-        it "does not throw an error", ->
-          expect(editor.lineForScreenRow(1).fold).toBeUndefined()
-          languageMode.unfoldBufferRow(1)
-          expect(editor.lineForScreenRow(1).fold).toBeUndefined()
-
     describe ".isFoldableAtBufferRow(bufferRow)", ->
       it "returns true if the line starts a foldable row range", ->
         expect(languageMode.isFoldableAtBufferRow(0)).toBe true

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/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)
@@ -164,7 +169,7 @@ class DisplayBuffer extends Model
   # Removes any folds found that contain the given buffer row.
   #
   # bufferRow - The buffer row {Number} to check against
-  destroyFoldsContainingBufferRow: (bufferRow) ->
+  unfoldBufferRow: (bufferRow) ->
     fold.destroy() for fold in @foldsContainingBufferRow(bufferRow)
 
   # Given a buffer row, this returns the largest fold that starts there.
@@ -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

@@ -193,7 +193,7 @@ class EditorView extends View
         'editor:unfold-all': => @editor.unfoldAll()
         'editor:fold-current-row': => @editor.foldCurrentRow()
         'editor:unfold-current-row': => @editor.unfoldCurrentRow()
-        'editor:fold-selection': => @editor.foldSelection()
+        'editor:fold-selection': => @editor.foldSelectedLines()
         'editor:fold-at-indent-level-1': => @editor.foldAllAtIndentLevel(0)
         'editor:fold-at-indent-level-2': => @editor.foldAllAtIndentLevel(1)
         'editor:fold-at-indent-level-3': => @editor.foldAllAtIndentLevel(2)
@@ -210,7 +210,7 @@ class EditorView extends View
         'editor:move-line-up': => @editor.moveLineUp()
         'editor:move-line-down': => @editor.moveLineDown()
         'editor:duplicate-line': => @editor.duplicateLine()
-        'editor:join-line': => @editor.joinLine()
+        'editor:join-lines': => @editor.joinLines()
         'editor:toggle-indent-guide': => atom.config.toggle('editor.showIndentGuide')
         'editor:toggle-line-numbers': =>  atom.config.toggle('editor.showLineNumbers')
         'editor:scroll-to-cursor': => @scrollToCursorPosition()

src/language-mode.coffee

@@ -121,12 +121,6 @@ class LanguageMode
       fold = @editor.displayBuffer.largestFoldStartingAtBufferRow(startRow)
       return @editor.createFold(startRow, endRow) unless fold
 
-  # Given a buffer row, this unfolds it.
-  #
-  # bufferRow - A {Number} indicating the buffer row
-  unfoldBufferRow: (bufferRow) ->
-    @editor.displayBuffer.largestFoldContainingBufferRow(bufferRow)?.destroy()
-
   # Find the row range for a fold at a given bufferRow. Will handle comments
   # and code.
   #

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

src/selection.coffee

@@ -282,7 +282,7 @@ class Selection
   #   :undo - if `skip`, skips the undo stack for this operation.
   insertText: (text, options={}) ->
     oldBufferRange = @getBufferRange()
-    @editor.destroyFoldsContainingBufferRow(oldBufferRange.end.row)
+    @editor.unfoldBufferRow(oldBufferRange.end.row)
     wasReversed = @isReversed()
     @clear()
     @cursor.needsAutoscroll = @cursor.isLastCursor()
@@ -334,11 +334,15 @@ class Selection
 
     normalizedLines.join('\n')
 
-  # Public: Indents the selection.
+  # Indent the current line(s).
+  #
+  # If the selection is empty, indents the current line if the cursor precedes
+  # non-whitespace characters, and otherwise inserts a tab. If the selection is
+  # non empty, calls {::indentSelectedRows}.
   #
   # options - A {Object} with the keys:
-  #   :autoIndent - If `true`, the indentation is performed appropriately.
-  #                 Otherwise, {Editor::getTabText} is used.
+  #   :autoIndent - If `true`, the line is indented to an automatically-inferred
+  #                 level. Otherwise, {Editor::getTabText} is inserted.
   indent: ({ autoIndent }={})->
     { row, column } = @cursor.getBufferPosition()
 
@@ -433,7 +437,7 @@ class Selection
   # Public: Joins the current line with the one below it.
   #
   # If there selection spans more than one line, all the lines are joined together.
-  joinLine: ->
+  joinLines: ->
     selectedRange = @getBufferRange()
     if selectedRange.isEmpty()
       return if selectedRange.start.row is @editor.buffer.getLastRow()

static/panes.less

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