"
+ lineHTML = "
"
if text is ""
lineHTML += @buildEmptyLineInnerHTML(id)
@@ -284,9 +292,6 @@ class LinesTileComponent
lineNode = @lineNodesByLineId[id]
- if @newState.width isnt @oldState.width
- lineNode.style.width = @newState.width + 'px'
-
newDecorationClasses = newLineState.decorationClasses
oldDecorationClasses = oldLineState.decorationClasses
@@ -302,10 +307,6 @@ class LinesTileComponent
oldLineState.decorationClasses = newLineState.decorationClasses
- if newLineState.top isnt oldLineState.top
- lineNode.style.top = newLineState.top + 'px'
- oldLineState.top = newLineState.top
-
if newLineState.screenRow isnt oldLineState.screenRow
lineNode.dataset.screenRow = newLineState.screenRow
oldLineState.screenRow = newLineState.screenRow
diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index 51bc2c463..73b03ce88 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -749,6 +749,13 @@ class TextEditorComponent
tileComponent?.lineNumberNodeForScreenRow(screenRow)
+ tileNodesForLines: ->
+ @linesComponent.getTiles()
+
+ tileNodesForLineNumbers: ->
+ gutterComponent = @gutterContainerComponent.getLineNumberGutterComponent()
+ gutterComponent.getTiles()
+
screenRowForNode: (node) ->
while node?
if screenRow = node.dataset.screenRow
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index 2c0900092..cf31186a9 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -20,7 +20,7 @@ class TextEditorPresenter
@measuredHorizontalScrollbarHeight = horizontalScrollbarHeight
@measuredVerticalScrollbarWidth = verticalScrollbarWidth
@gutterWidth ?= 0
- @tileSize ?= 12
+ @tileSize ?= 6
@disposables = new CompositeDisposable
@emitter = new Emitter
@@ -584,22 +584,15 @@ class TextEditorPresenter
if startRow > 0
rowBeforeStartRow = startRow - 1
lastBufferRow = @model.bufferRowForScreenRow(rowBeforeStartRow)
- wrapCount = rowBeforeStartRow - @model.screenRowForBufferRow(lastBufferRow)
else
lastBufferRow = null
- wrapCount = 0
if endRow > startRow
bufferRows = @model.bufferRowsForScreenRows(startRow, endRow - 1)
- zIndex = bufferRows.length - 1
for bufferRow, i in bufferRows
if bufferRow is lastBufferRow
- wrapCount++
- id = bufferRow + '-' + wrapCount
softWrapped = true
else
- id = bufferRow
- wrapCount = 0
lastBufferRow = bufferRow
softWrapped = false
@@ -607,10 +600,10 @@ class TextEditorPresenter
top = (screenRow - startRow) * @lineHeight
decorationClasses = @lineNumberDecorationClassesForRow(screenRow)
foldable = @model.isFoldableAtScreenRow(screenRow)
+ id = @model.tokenizedLineForScreenRow(screenRow).id
- tileState.lineNumbers[id] = {screenRow, bufferRow, softWrapped, top, decorationClasses, foldable, zIndex}
+ tileState.lineNumbers[id] = {screenRow, bufferRow, softWrapped, top, decorationClasses, foldable}
visibleLineNumberIds[id] = true
- zIndex--
for id of tileState.lineNumbers
delete tileState.lineNumbers[id] unless visibleLineNumberIds[id]
diff --git a/src/tiled-component.coffee b/src/tiled-component.coffee
index 33719dda5..06433f8be 100644
--- a/src/tiled-component.coffee
+++ b/src/tiled-component.coffee
@@ -1,3 +1,5 @@
+{values} = require 'underscore-plus'
+
cloneObject = (object) ->
clone = {}
clone[key] = value for key, value of object
@@ -49,3 +51,6 @@ class TiledComponent
getComponentForTile: (tileRow) ->
@componentsByTileId[tileRow]
+
+ getTiles: ->
+ values(@componentsByTileId).map (component) -> component.getDomNode()
diff --git a/src/token-iterator.coffee b/src/token-iterator.coffee
index 202b044ba..de874d499 100644
--- a/src/token-iterator.coffee
+++ b/src/token-iterator.coffee
@@ -31,11 +31,14 @@ class TokenIterator
while @index < tags.length
tag = tags[@index]
if tag < 0
+ scope = atom.grammars.scopeForId(tag)
if tag % 2 is 0
- @scopeEnds.push(atom.grammars.scopeForId(tag + 1))
+ if @scopeStarts[@scopeStarts.length - 1] is scope
+ @scopeStarts.pop()
+ else
+ @scopeEnds.push(scope)
@scopes.pop()
else
- scope = atom.grammars.scopeForId(tag)
@scopeStarts.push(scope)
@scopes.push(scope)
@index++
diff --git a/src/workspace.coffee b/src/workspace.coffee
index 86e860fe2..62fda5aed 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -506,6 +506,15 @@ class Workspace extends Model
#
# Returns a {Disposable} on which `.dispose()` can be called to remove the
# opener.
+ #
+ # Note that the opener will be called if and only if the URI is not already open
+ # in the current pane. The searchAllPanes flag expands the search from the
+ # current pane to all panes. If you wish to open a view of a different type for
+ # a file that is already open, consider changing the protocol of the URI. For
+ # example, perhaps you wish to preview a rendered version of the file `/foo/bar/baz.quux`
+ # that is already open in a text editor view. You could signal this by calling
+ # {Workspace::open} on the URI `quux-preview://foo/bar/baz.quux`. Then your opener
+ # can check the protocol for quux-preview and only handle those URIs that match.
addOpener: (opener) ->
if includeDeprecatedAPIs
packageName = @getCallingPackageName()
diff --git a/static/atom.less b/static/atom.less
index 1acb0f54b..7a2384514 100644
--- a/static/atom.less
+++ b/static/atom.less
@@ -28,3 +28,4 @@
@import "text";
@import "utilities";
@import "octicons";
+@import "cursors";
diff --git a/static/cursors.less b/static/cursors.less
new file mode 100644
index 000000000..b2807217e
--- /dev/null
+++ b/static/cursors.less
@@ -0,0 +1,26 @@
+@import "./variables/syntax-variables";
+@import "syntax-variables";
+
+@import "./variables/ui-variables";
+@import "ui-variables";
+
+@ibeam-1x: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAL0lEQVQoz2NgCD3x//9/BhBYBWdhgFVAiVW4JBFKGIa4AqD0//9D3pt4I4tAdAMAHTQ/j5Zom30AAAAASUVORK5CYII=');
+@ibeam-2x: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAz0lEQVRIx2NgYGBY/R8I/vx5eelX3n82IJ9FxGf6tksvf/8FiTMQAcAGQMDvSwu09abffY8QYSAScNk45G198eX//yev73/4///701eh//kZSARckrNBRvz//+8+6ZohwCzjGNjdgQxkAg7B9WADeBjIBqtJCbhRA0YNoIkBSNmaPEMoNmA0FkYNoFKhapJ6FGyAH3nauaSmPfwI0v/3OukVi0CIZ+F25KrtYcx/CTIy0e+rC7R1Z4KMICVTQQ14feVXIbR695u14+Ir4gwAAD49E54wc1kWAAAAAElFTkSuQmCC');
+
+.cursor-white() {
+ cursor: -webkit-image-set(@ibeam-1x 1x, @ibeam-2x 2x) 5 8, text;
+}
+
+// Editors
+& when ( lightness(@syntax-background-color) < 50% ) {
+ .platform-darwin atom-text-editor:not([mini])::shadow .editor-contents--private {
+ .cursor-white();
+ }
+}
+
+// Mini Editors
+& when ( lightness(@input-background-color) < 50% ) {
+ .platform-darwin atom-text-editor[mini]::shadow .editor-contents--private {
+ .cursor-white();
+ }
+}
diff --git a/static/text-editor-light.less b/static/text-editor-light.less
index 819fc565f..7fafade1e 100644
--- a/static/text-editor-light.less
+++ b/static/text-editor-light.less
@@ -46,6 +46,7 @@ atom-text-editor {
}
.line-number {
+ position: relative;
white-space: nowrap;
padding-left: .5em;
opacity: 0.6;
diff --git a/static/text-editor-shadow.less b/static/text-editor-shadow.less
index 80dc4967b..e481d11b8 100644
--- a/static/text-editor-shadow.less
+++ b/static/text-editor-shadow.less
@@ -29,6 +29,7 @@
}
.line-number {
+ position: relative;
white-space: nowrap;
padding-left: .5em;
opacity: 0.6;