From 1676617218978cb10121e33e2fd8c45957d323aa Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 22 Mar 2017 12:31:51 -0600 Subject: [PATCH] Add static TextEditor.viewForOverlayItem method to avoid using global --- src/initialize-application-window.coffee | 1 + src/initialize-benchmark-window.js | 1 + src/initialize-test-window.coffee | 1 + src/text-editor-component.js | 2 +- src/text-editor.coffee | 2 ++ 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/initialize-application-window.coffee b/src/initialize-application-window.coffee index a70ca54b7..ccf88cc9f 100644 --- a/src/initialize-application-window.coffee +++ b/src/initialize-application-window.coffee @@ -58,6 +58,7 @@ if global.isGeneratingSnapshot clipboard = new Clipboard TextEditor.setClipboard(clipboard) +TextEditor.viewForOverlayItem = (item) -> atom.views.getView(item) global.atom = new AtomEnvironment({ clipboard, diff --git a/src/initialize-benchmark-window.js b/src/initialize-benchmark-window.js index a8f1aafe6..2d9e724b2 100644 --- a/src/initialize-benchmark-window.js +++ b/src/initialize-benchmark-window.js @@ -54,6 +54,7 @@ export default async function () { const clipboard = new Clipboard() TextEditor.setClipboard(clipboard) + TextEditor.viewForOverlayItem = (item) -> atom.views.getView(item) const applicationDelegate = new ApplicationDelegate() const environmentParams = { diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee index e87586374..a5fdc43d6 100644 --- a/src/initialize-test-window.coffee +++ b/src/initialize-test-window.coffee @@ -70,6 +70,7 @@ module.exports = ({blobStore}) -> clipboard = new Clipboard TextEditor.setClipboard(clipboard) + TextEditor.viewForOverlayItem = (item) -> atom.views.getView(item) testRunner = require(testRunnerPath) legacyTestRunner = require(legacyTestRunnerPath) diff --git a/src/text-editor-component.js b/src/text-editor-component.js index 770af9afb..0d5cb0811 100644 --- a/src/text-editor-component.js +++ b/src/text-editor-component.js @@ -732,7 +732,7 @@ class TextEditorComponent { addOverlayDecorationToRender (decoration, marker) { const {class: className, item, position, avoidOverflow} = decoration - const element = atom.views.getView(item) + const element = TextEditor.viewForOverlayItem(item) const screenPosition = (position === 'tail') ? marker.getTailScreenPosition() : marker.getHeadScreenPosition() diff --git a/src/text-editor.coffee b/src/text-editor.coffee index 442858434..33bfcbf6f 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -65,6 +65,8 @@ class TextEditor extends Model TextEditorComponent ?= require './text-editor-component' TextEditorComponent.didUpdateScrollbarStyles() + @viewForOverlayItem: (item) -> item + serializationVersion: 1 buffer: null