Comparar commits

...

6 Commits

Autor SHA1 Mensagem Data
Nathan Sobo 60375007e7 Run special assertion if editor.debugFindMaxLineLength is true 2014-07-03 14:20:45 -06:00
Kevin Sawicki 3360d8500f Upgrade to bracket-matcher@0.48 2014-07-03 10:58:57 -07:00
Nathan Sobo a4ed02c3c5 Update lines for line insertions/removals preceding rendered row range 2014-07-03 11:22:57 -06:00
Kevin Sawicki 5658f9ab07 Upgrade to language-coffee-script@0.23 2014-07-03 10:08:35 -07:00
Kevin Sawicki c890e56cef Upgrade to language-javascript@0.32 2014-07-03 09:49:46 -07:00
Kevin Sawicki 5d22ce7128 Prepare 0.109 2014-07-03 09:33:18 -07:00
4 arquivos alterados com 38 adições e 5 exclusões
+4 -4
Ver Arquivo
@@ -1,7 +1,7 @@
{
"name": "atom",
"productName": "Atom",
"version": "0.108.0",
"version": "0.109.0",
"description": "A hackable text editor for the 21st Century.",
"main": "./src/browser/main.js",
"repository": {
@@ -75,7 +75,7 @@
"autosave": "0.14.0",
"background-tips": "0.15.0",
"bookmarks": "0.26.0",
"bracket-matcher": "0.47.0",
"bracket-matcher": "0.48.0",
"command-palette": "0.24.0",
"deprecation-cop": "0.7.0",
"dev-live-reload": "0.31.0",
@@ -109,7 +109,7 @@
"wrap-guide": "0.19.0",
"language-c": "0.21.0",
"language-coffee-script": "0.22.0",
"language-coffee-script": "0.23.0",
"language-css": "0.17.0",
"language-gfm": "0.42.0",
"language-git": "0.9.0",
@@ -117,7 +117,7 @@
"language-html": "0.22.0",
"language-hyperlink": "0.10.0",
"language-java": "0.11.0",
"language-javascript": "0.30.0",
"language-javascript": "0.32.0",
"language-json": "0.8.0",
"language-less": "0.11.0",
"language-make": "0.10.0",
+16
Ver Arquivo
@@ -111,6 +111,22 @@ describe "EditorComponent", ->
expect(component.lineNodeForScreenRow(3).offsetTop).toBe 3 * lineHeightInPixels
expect(component.lineNodeForScreenRow(4).offsetTop).toBe 4 * lineHeightInPixels
it "updates the lines when lines are inserted or removed above the rendered row range", ->
node.style.height = 4.5 * lineHeightInPixels + 'px'
component.measureScrollView()
runSetImmediateCallbacks()
verticalScrollbarNode.scrollTop = 5 * lineHeightInPixels
verticalScrollbarNode.dispatchEvent(new UIEvent('scroll'))
buffer = editor.getBuffer()
buffer.insert([0, 0], '\n\n')
runSetImmediateCallbacks()
expect(component.lineNodeForScreenRow(3).textContent).toBe editor.lineForScreenRow(3).text
buffer.delete([[0, 0], [3, 0]])
runSetImmediateCallbacks()
expect(component.lineNodeForScreenRow(3).textContent).toBe editor.lineForScreenRow(3).text
it "updates the top position of lines when the line height changes", ->
initialLineHeightInPixels = editor.getLineHeightInPixels()
component.setLineHeight(2)
+14
Ver Arquivo
@@ -1075,8 +1075,22 @@ class DisplayBuffer extends Model
@longestScreenRow = maxLengthCandidatesStartRow + screenRow
@maxLineLength = length
if atom.config.get('editor.debugFindMaxLineLength')
unless @maxLineLength is @findReferenceMaxLineLength()
debugger
throw new Error("Found wrong max line length")
@computeScrollWidth() if oldMaxLineLength isnt @maxLineLength
findReferenceMaxLineLength: ->
maxLineLength = 0
for line in @screenLines
length = line.text.length
maxLineLength = length if length > maxLineLength
maxLineLength
computeScrollWidth: ->
@scrollWidth = @pixelPositionForScreenPosition([@longestScreenRow, @maxLineLength]).left + 1
+4 -1
Ver Arquivo
@@ -53,7 +53,10 @@ LinesComponent = React.createClass
{renderedRowRange, pendingChanges} = newProps
[renderedStartRow, renderedEndRow] = renderedRowRange
for change in pendingChanges
return true unless change.end < renderedStartRow or renderedEndRow <= change.start
if change.screenDelta is 0
return true unless change.end < renderedStartRow or renderedEndRow <= change.start
else
return true unless renderedEndRow <= change.start
false