From dfd3e1b94840de8eecd89aa9793bc32f4260037c Mon Sep 17 00:00:00 2001
From: joshaber <joshaber@gmail.com>
Date: Thu, 25 Feb 2016 17:11:04 -0500
Subject: [PATCH] Take autoHeight as an argument.

---
 src/text-editor-element.coffee | 9 ++++-----
 src/text-editor.coffee         | 6 +-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/text-editor-element.coffee b/src/text-editor-element.coffee
index 6fad33dc3..02f688e2c 100644
--- a/src/text-editor-element.coffee
+++ b/src/text-editor-element.coffee
@@ -39,6 +39,9 @@ class TextEditorElement extends HTMLElement
     @setAttribute('tabindex', -1)
 
   initializeContent: (attributes) ->
+    unless @autoHeight
+      @style.height = "100%"
+
     if @config.get('editor.useShadowDOM')
       @useShadowDOM = true
 
@@ -87,7 +90,7 @@ class TextEditorElement extends HTMLElement
     @subscriptions.add @component.onDidChangeScrollLeft =>
       @emitter.emit("did-change-scroll-left", arguments...)
 
-  initialize: (model, {@views, @config, @themes, @workspace, @assert, @styles, @grammars}, @ignoreScrollPastEnd = false) ->
+  initialize: (model, {@views, @config, @themes, @workspace, @assert, @styles, @grammars}, @autoHeight = true, @ignoreScrollPastEnd = false) ->
     throw new Error("Must pass a config parameter when initializing TextEditorElements") unless @views?
     throw new Error("Must pass a config parameter when initializing TextEditorElements") unless @config?
     throw new Error("Must pass a themes parameter when initializing TextEditorElements") unless @themes?
@@ -346,10 +349,6 @@ class TextEditorElement extends HTMLElement
     @style.height = height + "px"
     @component.measureDimensions()
 
-  disableAutoHeight: ->
-    @style.height = "100%"
-    @component.measureDimensions()
-
   getHeight: ->
     @offsetHeight
 
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index c22a1a73f..2823b993e 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -3154,11 +3154,7 @@ class TextEditor extends Model
 
   # Get the Element for the editor.
   getElement: ->
-    unless @editorElement?
-      @editorElement = new TextEditorElement().initialize(this, atom, @ignoreScrollPastEnd)
-      unless @autoHeight
-        @editorElement.disableAutoHeight()
-    @editorElement
+    @editorElement ?= new TextEditorElement().initialize(this, atom, @autoHeight, @ignoreScrollPastEnd)
 
   # Essential: Retrieves the greyed out placeholder of a mini editor.
   #