Comparar commits

..

35 Commits

Autor SHA1 Mensagem Data
Nathan Sobo ce5eef2605 Remove outdated section of the creating-a-package docs 2014-02-27 15:59:06 -08:00
Nathan Sobo 6d6960badb Merge pull request #1610 from atom/ns-better-error-reporting
Improve reporting of display buffer errors
2014-02-28 01:50:47 +02:00
Corey Johnson 54269aa92a Upgrade to fuzzaldrin@1.1.0 2014-02-27 15:39:17 -08:00
Kevin Sawicki ec65a71d6d Merge pull request #1607 from atom/ks-bump-max-size-to-two-mb
Bump max size to 2MB
2014-02-27 15:39:10 -08:00
Nathan Sobo 761fcde654 💄 2014-02-27 15:34:19 -08:00
Kevin Sawicki 3346ddac38 Bump max size to 2MB 2014-02-27 15:32:19 -08:00
Nathan Sobo f20c55f849 Use error constructor's name explicitly rather than arguments.callee 2014-02-27 15:29:47 -08:00
Kevin Sawicki 37c5c35a12 Upgrade to language-less@0.6.0 2014-02-27 15:28:29 -08:00
Nathan Sobo e541ccb197 Update exception-reporting to 0.16.0 for metadata, custom error names 2014-02-27 15:07:08 -08:00
Nathan Sobo 1f7027d825 Throw a custom BufferToScreenConversion error with metadata 2014-02-27 15:07:08 -08:00
Kevin Sawicki 0d9e7a5e08 Only scan dirty buffers that are inside the project 2014-02-27 14:44:34 -08:00
Kevin Sawicki c4ac96e669 Upgrade to markdown-preview@0.40.0 2014-02-27 13:48:48 -08:00
Kevin Sawicki 74f65b978e Bump minimum version to 10.8
Closes #1598
2014-02-27 13:35:00 -08:00
Kevin Sawicki eab874b3ef Upgrade to symbols-view@0.39.0 2014-02-27 13:27:12 -08:00
Kevin Sawicki 54d9361dad Upgrade to release-notes@0.25.0 2014-02-27 13:06:09 -08:00
Kevin Sawicki e8cd130ad6 Upgrade to markdown-preview@0.39.0 2014-02-27 13:02:30 -08:00
Kevin Sawicki 2f70f4ba25 📝 publishing not publish in links 2014-02-27 12:07:13 -08:00
Kevin Sawicki 1548167b94 Upgrade to language-make@0.9.0 2014-02-27 11:45:05 -08:00
Kevin Sawicki 91a320127a Upgrade to settings-view@0.85.0 2014-02-27 11:27:51 -08:00
Kevin Sawicki 7a0a4dc3b3 Upgrade to go-to-line@0.18.0 2014-02-27 11:11:36 -08:00
Kevin Sawicki ba9c006cb4 Update to wrap-guide@0.16.0 2014-02-27 11:06:01 -08:00
Kevin Sawicki 2f92160e9c Upgrade to styleguide@0.26.0 2014-02-27 11:01:38 -08:00
Kevin Sawicki 8f0063465c Update apm for 2fa sms fix 2014-02-27 10:55:12 -08:00
Nathan Sobo 0c8bb089b9 Reduce variation of buffer row to screen row conversion error message 2014-02-27 10:34:57 -08:00
Kevin Sawicki 746b99508b Upgrade to language-coffee-script@0.14.0 2014-02-27 09:32:48 -08:00
Kevin Sawicki 05ce497f29 Upgrade to language-javascript@0.12.0 2014-02-27 09:32:09 -08:00
Kevin Sawicki 5bfb382209 Upgrade to settings-view@0.84.0 2014-02-27 09:31:26 -08:00
Cheng Zhao 32efa7b112 Merge pull request #1599 from atom/atom-shell-v0.10.2
Upgrade to atom-shell@0.10.2
2014-02-27 17:18:32 +00:00
Cheng Zhao e4fcd589db Upgrade to atom-shell@0.10.3 2014-02-28 01:07:35 +08:00
Kevin Sawicki 8da5a99196 Upgrade to markdown-preview@0.38.0 2014-02-27 09:02:42 -08:00
Kevin Sawicki d5cb79027a Link to creating-a-package doc 2014-02-27 08:00:43 -08:00
Kevin Sawicki fea1a001ee Link to proper theme doc 2014-02-27 08:00:43 -08:00
Cheng Zhao 3ae6f0a93d Upgrade to atom-shell@0.10.2 2014-02-27 19:05:56 +08:00
Nathan Sobo 28d7db2371 Set overflow to 'hidden' on panes. I'm pretty sure this fixes #1594. 2014-02-26 18:19:07 -08:00
Kevin Sawicki 02b582a60d Prepare 0.61.0 release 2014-02-26 17:27:37 -08:00
12 arquivos alterados com 50 adições e 67 exclusões
+1 -1
Ver Arquivo
@@ -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
+1 -1
Ver Arquivo
@@ -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
-36
Ver Arquivo
@@ -355,39 +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]: http://jasmine.github.io
[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
[convert-bundle]: converting-a-text-mate-bundle.html
[convert-theme]: converting-a-text-mate-theme.html
+2 -2
Ver Arquivo
@@ -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
+1 -1
Ver Arquivo
@@ -6,7 +6,7 @@
* [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-bundle.md)
* [Converting a TextMate Theme](converting-a-text-mate-theme.md)
* [Contributing](contributing.md)
### Advanced Topics
+15 -15
Ver Arquivo
@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "0.60.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",
"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",
"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.83.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.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.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",
+1 -1
Ver Arquivo
@@ -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>
+10
Ver Arquivo
@@ -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')
+14 -7
Ver Arquivo
@@ -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
+3 -2
Ver Arquivo
@@ -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
+1
Ver Arquivo
@@ -24,6 +24,7 @@
display: -webkit-flex;
-webkit-flex: 1;
-webkit-flex-direction: column;
overflow: hidden;
.item-views {
-webkit-flex: 1;
externo
+1 -1
Submodule vendor/apm updated: db315b0c0a...daea015474