Improve goto line functionalitt

services/web/public/coffee/app/ide/editor/annotations/AnnotationsManager.coffee

@@ -1,224 +0,0 @@
-define [
-	"ace/range"
-], () ->
-	Range = require("ace/range").Range
-
-	class AnnotationsManager
-		constructor: (@$scope, @editor, @element) ->
-			@markerIds = []
-			@labels = []
-
-			@$scope.annotationLabel = {
-				show: false
-				right:  "auto"
-				left:   "auto"
-				top:    "auto"
-				bottom: "auto"
-				backgroundColor: "black"
-				text: ""
-			}
-
-			@$scope.$watch "annotations", (value) =>
-				@redrawAnnotations()
-
-			@$scope.$watch "theme", (value) =>
-				@redrawAnnotations()
-
-			@editor.on "mousemove", (e) =>
-				position = @editor.renderer.screenToTextCoordinates(e.clientX, e.clientY)
-				e.position = position
-				@showAnnotationLabels(position)
-
-		redrawAnnotations: () ->
-			@_clearMarkers()
-			@_clearLabels()
-
-			for annotation in @$scope.annotations or []
-				do (annotation) =>
-					colorScheme = @_getColorScheme(annotation.hue)
-					if annotation.cursor?
-						@labels.push {
-							text: annotation.text
-							range: new Range(
-								annotation.cursor.row, annotation.cursor.column,
-								annotation.cursor.row, annotation.cursor.column + 1
-							)
-							colorScheme: colorScheme
-							snapToStartOfRange: true
-						}
-						@_drawCursor(annotation, colorScheme)
-					else if annotation.highlight?
-						@labels.push {
-							text: annotation.label
-							range: new Range(
-								annotation.highlight.start.row, annotation.highlight.start.column,
-								annotation.highlight.end.row,   annotation.highlight.end.column
-							)
-							colorScheme: colorScheme
-						}
-						@_drawHighlight(annotation, colorScheme)
-					else if annotation.strikeThrough?
-						@labels.push {
-							text: annotation.label
-							range: new Range(
-								annotation.strikeThrough.start.row, annotation.strikeThrough.start.column,
-								annotation.strikeThrough.end.row,   annotation.strikeThrough.end.column
-							)
-							colorScheme: colorScheme
-						}
-						@_drawStrikeThrough(annotation, colorScheme)
-
-		showAnnotationLabels: (position) ->
-			labelToShow = null
-			for label in @labels or []
-				if label.range.contains(position.row, position.column)
-					labelToShow = label
-
-			if !labelToShow?
-				@$scope.$apply () =>
-					@$scope.annotationLabel.show = false
-			else
-				$ace = $(@editor.renderer.container).find(".ace_scroller")
-				# Move the label into the Ace content area so that offsets and positions are easy to calculate.
-				$ace.append(@element.find(".annotation-label"))
-
-				if labelToShow.snapToStartOfRange
-					coords = @editor.renderer.textToScreenCoordinates(labelToShow.range.start.row, labelToShow.range.start.column)
-				else
-					coords = @editor.renderer.textToScreenCoordinates(position.row, position.column)
-
-				offset = $ace.offset()
-				height = $ace.height()
-				coords.pageX = coords.pageX - offset.left
-				coords.pageY = coords.pageY - offset.top
-
-				if coords.pageY > @editor.renderer.lineHeight * 2
-					top    = "auto"
-					bottom = height - coords.pageY
-				else
-					top    = coords.pageY + @editor.renderer.lineHeight
-					bottom = "auto"
-
-				# Apply this first that the label has the correct width when calculating below
-				@$scope.$apply () =>
-					@$scope.annotationLabel.text = labelToShow.text
-					@$scope.annotationLabel.show = true
-
-				$label = @element.find(".annotation-label")
-				console.log "pageX", coords.pageX, "label", $label.outerWidth(), "ace", $ace.width()
-
-				if coords.pageX + $label.outerWidth() < $ace.width()
-					left  = coords.pageX
-					right = "auto"
-				else
-					right = 0
-					left = "auto"
-
-				@$scope.$apply () =>
-					@$scope.annotationLabel = {
-						show:   true
-						left:   left
-						right:  right
-						bottom: bottom
-						top:    top
-						backgroundColor: labelToShow.colorScheme.labelBackgroundColor
-						text:   labelToShow.text
-					}
-
-		_clearMarkers: () ->
-			for marker_id in @markerIds
-				@editor.getSession().removeMarker(marker_id)
-			@markerIds = []
-
-		_clearLabels: () ->
-			@labels = []
-
-		_drawCursor: (annotation, colorScheme) ->
-			@markerIds.push @editor.getSession().addMarker new Range(
-				annotation.cursor.row, annotation.cursor.column,
-				annotation.cursor.row, annotation.cursor.column + 1
-			), "annotation remote-cursor", (html, range, left, top, config) ->
-				div = """
-					<div
-						class='remote-cursor custom ace_start'
-						style='height: #{config.lineHeight}px; top:#{top}px; left:#{left}px; border-color: #{colorScheme.cursor};'
-					>
-						<div class="nubbin" style="bottom: #{config.lineHeight}px; background-color: #{colorScheme.cursor};"></div>
-					</div>
-				"""
-				html.push div
-			, true
-
-		_drawHighlight: (annotation, colorScheme) ->
-			@_addMarkerWithCustomStyle(
-				new Range(
-					annotation.highlight.start.row, annotation.highlight.start.column,
-					annotation.highlight.end.row,   annotation.highlight.end.column + 1
-				),
-				"annotation highlight",
-				false,
-				"background-color: #{colorScheme.highlightBackgroundColor}"
-			)
-
-		_drawStrikeThrough: (annotation, colorScheme) ->
-			lineHeight = @editor.renderer.lineHeight
-			@_addMarkerWithCustomStyle(
-				new Range(
-					annotation.strikeThrough.start.row, annotation.strikeThrough.start.column,
-					annotation.strikeThrough.end.row,   annotation.strikeThrough.end.column + 1
-				),
-				"annotation strike-through-background",
-				false,
-				"background-color: #{colorScheme.strikeThroughBackgroundColor}"
-			)
-			@_addMarkerWithCustomStyle(
-				new Range(
-					annotation.strikeThrough.start.row, annotation.strikeThrough.start.column,
-					annotation.strikeThrough.end.row,   annotation.strikeThrough.end.column + 1
-				), 
-				"annotation strike-through-foreground",
-				true, 
-				"""
-					height: #{Math.round(lineHeight/2) + 2}px;
-					border-bottom: 2px solid #{colorScheme.strikeThroughForegroundColor};
-				"""
-			)
-
-		_addMarkerWithCustomStyle: (range, klass, foreground, style) ->
-			if foreground?
-				markerLayer = @editor.renderer.$markerBack
-			else
-				markerLayer = @editor.renderer.$markerFront
-
-			@markerIds.push @editor.getSession().addMarker range, klass, (html, range, left, top, config) ->
-				if range.isMultiLine()
-					markerLayer.drawTextMarker(html, range, klass, config, style)
-				else
-					markerLayer.drawSingleLineMarker(html, range, "#{klass} ace_start", config, 0, style)
-			, foreground
-
-		_getColorScheme: (hue) ->
-			if @_isDarkTheme()
-				return {
-					cursor: "hsl(#{hue}, 100%, 50%)"
-					labelBackgroundColor: "hsl(#{hue}, 100%, 50%)"
-					highlightBackgroundColor: "hsl(#{hue}, 100%, 28%);"
-					strikeThroughBackgroundColor: "hsl(#{hue}, 100%, 20%);"
-					strikeThroughForegroundColor: "hsl(#{hue}, 100%, 60%);"
-				}
-			else
-				return {
-					cursor: "hsl(#{hue}, 100%, 50%)"
-					labelBackgroundColor: "hsl(#{hue}, 100%, 50%)"
-					highlightBackgroundColor: "hsl(#{hue}, 70%, 85%);"
-					strikeThroughBackgroundColor: "hsl(#{hue}, 70%, 95%);"
-					strikeThroughForegroundColor: "hsl(#{hue}, 70%, 40%);"
-				}
-
-		_isDarkTheme: () ->
-			rgb = @element.find(".ace_editor").css("background-color");
-			[m, r, g, b] = rgb.match(/rgb\(([0-9]+), ([0-9]+), ([0-9]+)\)/)
-			r = parseInt(r, 10)
-			g = parseInt(g, 10)
-			b = parseInt(b, 10)
-			return r + g + b < 3 * 128

services/web/public/coffee/app/ide/editor/cursor-position/CursorPositionManager.coffee

@@ -16,6 +16,8 @@ define [], () ->
 				if value?
 					setTimeout () =>
 						@gotoLine(value)
+						@$scope.$apply () =>
+							@$scope.gotoLine = null
 					, 0
 
 		onScrollTopChange: (event) ->
@@ -40,4 +42,5 @@ define [], () ->
 			delete @ignoreCursorPositionChanges
 
 		gotoLine: (line) ->
-			@editor.moveCursorToPosition({row: line, column: 0})
+			@editor.gotoLine(line)
+			@editor.focus()

services/web/public/coffee/app/ide/pdf/controllers/PdfController.coffee

@@ -137,7 +137,7 @@ define [
 			entity = ide.fileTreeManager.findEntityByPath(entry.file)
 			return if entity.type != "doc"
 			if entry.line?
-				line = entry.line - 1
+				line = entry.line
 			ide.editorManager.openDoc(entity, gotoLine: line)
 	]