From 41fc4f7fe62ffd05d206f97d6e714a0114302fb8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 18 Sep 2013 09:01:13 -0700 Subject: [PATCH] Use relative require paths in src/ files --- src/atom-package.coffee | 12 ++++++------ src/atom.coffee | 8 ++++---- src/binding-set.coffee | 6 +++--- src/buffered-node-process.coffee | 2 +- src/buffered-process.coffee | 2 +- src/command-installer.coffee | 4 ++-- src/config.coffee | 6 +++--- src/cursor-view.coffee | 4 ++-- src/cursor.coffee | 4 ++-- src/directory.coffee | 8 ++++---- src/display-buffer-marker.coffee | 6 +++--- src/display-buffer.coffee | 18 +++++++++--------- src/edit-session.coffee | 17 ++++++++--------- src/editor.coffee | 18 +++++++++--------- src/event-emitter.coffee | 2 +- src/file.coffee | 6 +++--- src/fs-utils.coffee | 2 +- src/git.coffee | 10 +++++----- src/gutter.coffee | 6 +++--- src/jquery-extensions.coffee | 4 ++-- src/keymap.coffee | 8 ++++---- src/language-mode.coffee | 7 +++---- src/less-compile-cache.coffee | 2 +- src/null-grammar.coffee | 6 +++--- src/package.coffee | 4 ++-- src/pane-axis.coffee | 4 ++-- src/pane-column.coffee | 6 +++--- src/pane-container.coffee | 6 +++--- src/pane-row.coffee | 6 +++--- src/pane.coffee | 10 +++++----- src/project.coffee | 18 +++++++++--------- src/root-view.coffee | 23 ++++++++++------------- src/scroll-view.coffee | 2 +- src/select-list.coffee | 8 ++++---- src/selection-view.coffee | 2 +- src/selection.coffee | 4 ++-- src/space-pen-extensions.coffee | 8 ++++---- src/subscriber.coffee | 2 +- src/syntax.coffee | 12 ++++++------ src/task.coffee | 4 ++-- src/text-buffer.coffee | 10 +++++----- src/text-mate-grammar.coffee | 8 ++++---- src/text-mate-package.coffee | 8 ++++---- src/theme-manager.coffee | 10 +++++----- src/token.coffee | 4 ++-- src/tokenized-buffer.coffee | 10 +++++----- src/tokenized-line.coffee | 2 +- src/window-bootstrap.coffee | 4 ++-- src/window-event-handler.coffee | 8 ++++---- src/window.coffee | 11 ++++------- 50 files changed, 177 insertions(+), 185 deletions(-) diff --git a/src/atom-package.coffee b/src/atom-package.coffee index 338a4b623..8b8289b13 100644 --- a/src/atom-package.coffee +++ b/src/atom-package.coffee @@ -1,11 +1,11 @@ -TextMateGrammar = require 'text-mate-grammar' -Package = require 'package' -fsUtils = require 'fs-utils' +TextMateGrammar = require './text-mate-grammar' +Package = require './package' +fsUtils = require './fs-utils' path = require 'path' -_ = require 'underscore' -$ = require 'jquery' +_ = require './underscore-extensions' +$ = require './jquery-extensions' CSON = require 'season' -EventEmitter = require 'event-emitter' +EventEmitter = require './event-emitter' ### Internal: Loads and resolves packages. ### diff --git a/src/atom.coffee b/src/atom.coffee index 0dc42ebe9..87a9d1ea8 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -1,6 +1,6 @@ -fsUtils = require 'fs-utils' -$ = require 'jquery' -_ = require 'underscore' +fsUtils = require './fs-utils' +$ = require './jquery-extensions' +_ = require './underscore-extensions' Package = require 'package' ipc = require 'ipc' remote = require 'remote' @@ -9,7 +9,7 @@ path = require 'path' dialog = remote.require 'dialog' app = remote.require 'app' telepath = require 'telepath' -ThemeManager = require 'theme-manager' +ThemeManager = require './theme-manager' window.atom = loadedPackages: {} diff --git a/src/binding-set.coffee b/src/binding-set.coffee index 29ba0b97c..3ce361b2e 100644 --- a/src/binding-set.coffee +++ b/src/binding-set.coffee @@ -1,6 +1,6 @@ -$ = require 'jquery' -_ = require 'underscore' -fsUtils = require 'fs-utils' +$ = require './jquery-extensions' +_ = require './underscore-extensions' +fsUtils = require './fs-utils' Specificity = require '../vendor/specificity' PEG = require 'pegjs' diff --git a/src/buffered-node-process.coffee b/src/buffered-node-process.coffee index 6c84869fb..409a215ee 100644 --- a/src/buffered-node-process.coffee +++ b/src/buffered-node-process.coffee @@ -1,4 +1,4 @@ -BufferedProcess = require 'buffered-process' +BufferedProcess = require './buffered-process' path = require 'path' # Private: Like BufferedProcess, but accepts a node script instead of an diff --git a/src/buffered-process.coffee b/src/buffered-process.coffee index 3c96e4729..3c5099c65 100644 --- a/src/buffered-process.coffee +++ b/src/buffered-process.coffee @@ -1,6 +1,6 @@ ChildProcess = require 'child_process' path = require 'path' -_ = require 'underscore' +_ = require './underscore-extensions' # Private: A wrapper which provides buffering for ChildProcess. module.exports = diff --git a/src/command-installer.coffee b/src/command-installer.coffee index 3ceb0751b..0e1433484 100644 --- a/src/command-installer.coffee +++ b/src/command-installer.coffee @@ -1,9 +1,9 @@ path = require 'path' fs = require 'fs' -_ = require 'underscore' +_ = require './underscore-extensions' async = require 'async' mkdirp = require 'mkdirp' -fsUtils = require 'fs-utils' +fsUtils = require './fs-utils' symlinkCommand = (sourcePath, destinationPath, callback) -> mkdirp path.dirname(destinationPath), (error) -> diff --git a/src/config.coffee b/src/config.coffee index b06628583..5dae93605 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -1,6 +1,6 @@ -fsUtils = require 'fs-utils' -_ = require 'underscore' -EventEmitter = require 'event-emitter' +fsUtils = require './fs-utils' +_ = require './underscore-extensions' +EventEmitter = require './event-emitter' CSON = require 'season' fs = require 'fs' path = require 'path' diff --git a/src/cursor-view.coffee b/src/cursor-view.coffee index ca6e5037d..3c15c235d 100644 --- a/src/cursor-view.coffee +++ b/src/cursor-view.coffee @@ -1,6 +1,6 @@ -{View} = require 'space-pen' +{View} = require './space-pen-extensions' {Point, Range} = require 'telepath' -_ = require 'underscore' +_ = require './underscore-extensions' ### Internal ### module.exports = diff --git a/src/cursor.coffee b/src/cursor.coffee index ee148cb82..01a0b0b61 100644 --- a/src/cursor.coffee +++ b/src/cursor.coffee @@ -1,6 +1,6 @@ {Point, Range} = require 'telepath' -EventEmitter = require 'event-emitter' -_ = require 'underscore' +EventEmitter = require './event-emitter' +_ = require './underscore-extensions' # Public: The `Cursor` class represents the little blinking line identifying # where text can be inserted. diff --git a/src/directory.coffee b/src/directory.coffee index d63478893..0d96f05fe 100644 --- a/src/directory.coffee +++ b/src/directory.coffee @@ -1,10 +1,10 @@ -_ = require 'underscore' +_ = require './underscore-extensions' fs = require 'fs' path = require 'path' -fsUtils = require 'fs-utils' +fsUtils = require './fs-utils' pathWatcher = require 'pathwatcher' -File = require 'file' -EventEmitter = require 'event-emitter' +File = require './file' +EventEmitter = require './event-emitter' # Public: Represents a directory using {File}s module.exports = diff --git a/src/display-buffer-marker.coffee b/src/display-buffer-marker.coffee index 611802dde..a1eb17a6c 100644 --- a/src/display-buffer-marker.coffee +++ b/src/display-buffer-marker.coffee @@ -1,7 +1,7 @@ {Range} = require 'telepath' -_ = require 'underscore' -EventEmitter = require 'event-emitter' -Subscriber = require 'subscriber' +_ = require './underscore-extensions' +EventEmitter = require './event-emitter' +Subscriber = require './subscriber' # Private: module.exports = diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee index 255ea6113..79b379175 100644 --- a/src/display-buffer.coffee +++ b/src/display-buffer.coffee @@ -1,15 +1,15 @@ -_ = require 'underscore' +_ = require './underscore-extensions' guid = require 'guid' telepath = require 'telepath' {Point, Range} = telepath -TokenizedBuffer = require 'tokenized-buffer' -RowMap = require 'row-map' -EventEmitter = require 'event-emitter' -Fold = require 'fold' -Token = require 'token' -DisplayBufferMarker = require 'display-buffer-marker' -Subscriber = require 'subscriber' -ConfigObserver = require 'config-observer' +TokenizedBuffer = require './tokenized-buffer' +RowMap = require './row-map' +EventEmitter = require './event-emitter' +Fold = require './fold' +Token = require './token' +DisplayBufferMarker = require './display-buffer-marker' +Subscriber = require './subscriber' +ConfigObserver = require './config-observer' # Private: module.exports = diff --git a/src/edit-session.coffee b/src/edit-session.coffee index 09382501a..97943d673 100644 --- a/src/edit-session.coffee +++ b/src/edit-session.coffee @@ -1,16 +1,15 @@ -_ = require 'underscore' -fsUtils = require 'fs-utils' +_ = require './underscore-extensions' +fsUtils = require './fs-utils' path = require 'path' telepath = require 'telepath' guid = require 'guid' {Point, Range} = telepath -Buffer = require 'text-buffer' -LanguageMode = require 'language-mode' -DisplayBuffer = require 'display-buffer' -Cursor = require 'cursor' -Selection = require 'selection' -EventEmitter = require 'event-emitter' -Subscriber = require 'subscriber' +LanguageMode = require './language-mode' +DisplayBuffer = require './display-buffer' +Cursor = require './cursor' +Selection = require './selection' +EventEmitter = require './event-emitter' +Subscriber = require './subscriber' TextMateScopeSelector = require('first-mate').ScopeSelector # Public: The core model of Atom. diff --git a/src/editor.coffee b/src/editor.coffee index 446ef5708..3f475b785 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -1,13 +1,13 @@ -{View, $$} = require 'space-pen' -TextBuffer = require 'text-buffer' -Gutter = require 'gutter' +{View, $$} = require './space-pen-extensions' +TextBuffer = require './text-buffer' +Gutter = require './gutter' {Point, Range} = require 'telepath' -EditSession = require 'edit-session' -CursorView = require 'cursor-view' -SelectionView = require 'selection-view' -fsUtils = require 'fs-utils' -$ = require 'jquery' -_ = require 'underscore' +EditSession = require './edit-session' +CursorView = require './cursor-view' +SelectionView = require './selection-view' +fsUtils = require './fs-utils' +$ = require './jquery-extensions' +_ = require './underscore-extensions' # Private: Represents the entire visual pane in Atom. # diff --git a/src/event-emitter.coffee b/src/event-emitter.coffee index 8e23e892a..83eb6da95 100644 --- a/src/event-emitter.coffee +++ b/src/event-emitter.coffee @@ -1,4 +1,4 @@ -_ = require 'underscore' +_ = require './underscore-extensions' # Public: Provides a list of functions that can be used in Atom for event management. # diff --git a/src/file.coffee b/src/file.coffee index 30d7b6b0b..f908e5cba 100644 --- a/src/file.coffee +++ b/src/file.coffee @@ -1,9 +1,9 @@ -EventEmitter = require 'event-emitter' +EventEmitter = require './event-emitter' fs = require 'fs' path = require 'path' -fsUtils = require 'fs-utils' +fsUtils = require './fs-utils' pathWatcher = require 'pathwatcher' -_ = require 'underscore' +_ = require './underscore-extensions' # Public: Represents an individual file in the editor. # diff --git a/src/fs-utils.coffee b/src/fs-utils.coffee index 8285bbe13..0a3763156 100644 --- a/src/fs-utils.coffee +++ b/src/fs-utils.coffee @@ -1,4 +1,4 @@ -_ = require 'underscore' +_ = require './underscore-extensions' fs = require 'fs' mkdirp = require 'mkdirp' Module = require 'module' diff --git a/src/git.coffee b/src/git.coffee index 9b2e4e433..0018651ce 100644 --- a/src/git.coffee +++ b/src/git.coffee @@ -1,8 +1,8 @@ -_ = require 'underscore' -fsUtils = require 'fs-utils' -Subscriber = require 'subscriber' -EventEmitter = require 'event-emitter' -Task = require 'task' +_ = require './underscore-extensions' +fsUtils = require './fs-utils' +Subscriber = require './subscriber' +EventEmitter = require './event-emitter' +Task = require './task' GitUtils = require 'git-utils' # Public: Represents the underlying git operations performed by Atom. diff --git a/src/gutter.coffee b/src/gutter.coffee index 47e97abd1..d1c3ac8b1 100644 --- a/src/gutter.coffee +++ b/src/gutter.coffee @@ -1,7 +1,7 @@ -{View, $$, $$$} = require 'space-pen' +{View, $$, $$$} = require './space-pen-extensions' {Range} = require 'telepath' -$ = require 'jquery' -_ = require 'underscore' +$ = require './jquery-extensions' +_ = require './underscore-extensions' # Private: Represents the portion of the {Editor} containing row numbers. # diff --git a/src/jquery-extensions.coffee b/src/jquery-extensions.coffee index dd6375144..1b6e7f4fd 100644 --- a/src/jquery-extensions.coffee +++ b/src/jquery-extensions.coffee @@ -1,5 +1,5 @@ -$ = require 'jquery' -_ = require 'underscore' +$ = require '../vendor/jquery' +_ = require './underscore-extensions' $.fn.scrollBottom = (newValue) -> if newValue? diff --git a/src/keymap.coffee b/src/keymap.coffee index 55843bc9d..726460403 100644 --- a/src/keymap.coffee +++ b/src/keymap.coffee @@ -1,9 +1,9 @@ -$ = require 'jquery' -_ = require 'underscore' -fsUtils = require 'fs-utils' +$ = require './jquery-extensions' +_ = require './underscore-extensions' +fsUtils = require './fs-utils' path = require 'path' CSON = require 'season' -BindingSet = require 'binding-set' +BindingSet = require './binding-set' # Internal: Associates keymaps with actions. # diff --git a/src/language-mode.coffee b/src/language-mode.coffee index cee5b409c..f6d1e4341 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -1,9 +1,8 @@ {Range} = require 'telepath' -_ = require 'underscore' -require 'underscore-extensions' +_ = require './underscore-extensions' {OnigRegExp} = require 'oniguruma' -EventEmitter = require 'event-emitter' -Subscriber = require 'subscriber' +EventEmitter = require './event-emitter' +Subscriber = require './subscriber' ### Internal ### diff --git a/src/less-compile-cache.coffee b/src/less-compile-cache.coffee index 245f4279d..9bfaadf6f 100644 --- a/src/less-compile-cache.coffee +++ b/src/less-compile-cache.coffee @@ -1,6 +1,6 @@ path = require 'path' -_ = require 'underscore' +_ = require './underscore-extensions' LessCache = require 'less-cache' module.exports = diff --git a/src/null-grammar.coffee b/src/null-grammar.coffee index 6f8d62def..c79ef633a 100644 --- a/src/null-grammar.coffee +++ b/src/null-grammar.coffee @@ -1,6 +1,6 @@ -Token = require 'token' -EventEmitter = require 'event-emitter' -_ = require 'underscore' +Token = require './token' +EventEmitter = require './event-emitter' +_ = require './underscore-extensions' ### Internal ### module.exports = diff --git a/src/package.coffee b/src/package.coffee index 1ada8fbbc..81cc45fed 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -5,8 +5,8 @@ CSON = require 'season' module.exports = class Package @build: (path) -> - TextMatePackage = require 'text-mate-package' - AtomPackage = require 'atom-package' + TextMatePackage = require './text-mate-package' + AtomPackage = require './atom-package' if TextMatePackage.testName(path) new TextMatePackage(path) diff --git a/src/pane-axis.coffee b/src/pane-axis.coffee index d95cb976c..262b3ad67 100644 --- a/src/pane-axis.coffee +++ b/src/pane-axis.coffee @@ -1,5 +1,5 @@ -$ = require 'jquery' -{View} = require 'space-pen' +$ = require './jquery-extensions' +{View} = require './space-pen-extensions' telepath = require 'telepath' ### Internal ### diff --git a/src/pane-column.coffee b/src/pane-column.coffee index 9df7016a4..8cc5b5644 100644 --- a/src/pane-column.coffee +++ b/src/pane-column.coffee @@ -1,6 +1,6 @@ -$ = require 'jquery' -_ = require 'underscore' -PaneAxis = require 'pane-axis' +$ = require './jquery-extensions' +_ = require './underscore-extensions' +PaneAxis = require './pane-axis' # Internal: module.exports = diff --git a/src/pane-container.coffee b/src/pane-container.coffee index 06ede88de..b540b31c5 100644 --- a/src/pane-container.coffee +++ b/src/pane-container.coffee @@ -1,6 +1,6 @@ -{View} = require 'space-pen' -Pane = require 'pane' -$ = require 'jquery' +{View} = require './space-pen-extensions' +Pane = require './pane' +$ = require './jquery-extensions' telepath = require 'telepath' # Private: Manages the list of panes within a {RootView} diff --git a/src/pane-row.coffee b/src/pane-row.coffee index f13e40570..5d51677d3 100644 --- a/src/pane-row.coffee +++ b/src/pane-row.coffee @@ -1,6 +1,6 @@ -$ = require 'jquery' -_ = require 'underscore' -PaneAxis = require 'pane-axis' +$ = require './jquery-extensions' +_ = require './underscore-extensions' +PaneAxis = require './pane-axis' ### Internal ### diff --git a/src/pane.coffee b/src/pane.coffee index 8668a3783..e1d118cbc 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -1,10 +1,10 @@ {dirname} = require 'path' -{View} = require 'space-pen' -$ = require 'jquery' -_ = require 'underscore' +{View} = require './space-pen-extensions' +$ = require './jquery-extensions' +_ = require './underscore-extensions' telepath = require 'telepath' -PaneRow = require 'pane-row' -PaneColumn = require 'pane-column' +PaneRow = require './pane-row' +PaneColumn = require './pane-column' # Public: A container which can contains multiple items to be switched between. # diff --git a/src/project.coffee b/src/project.coffee index 65319a735..afef4f28a 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -1,17 +1,17 @@ -fsUtils = require 'fs-utils' +fsUtils = require './fs-utils' path = require 'path' url = require 'url' -_ = require 'underscore' -$ = require 'jquery' +_ = require './underscore-extensions' +$ = require './jquery-extensions' telepath = require 'telepath' {Range} = telepath -TextBuffer = require 'text-buffer' -EditSession = require 'edit-session' -EventEmitter = require 'event-emitter' -Directory = require 'directory' -BufferedNodeProcess = require 'buffered-node-process' -Git = require 'git' +TextBuffer = require './text-buffer' +EditSession = require './edit-session' +EventEmitter = require './event-emitter' +Directory = require './directory' +BufferedNodeProcess = require './buffered-node-process' +Git = require './git' # Public: Represents a project that's opened in Atom. # diff --git a/src/root-view.coffee b/src/root-view.coffee index 6530cf02f..694f064b7 100644 --- a/src/root-view.coffee +++ b/src/root-view.coffee @@ -1,19 +1,16 @@ ipc = require 'ipc' path = require 'path' -$ = require 'jquery' -{$$} = require 'space-pen' -fsUtils = require 'fs-utils' -_ = require 'underscore' +$ = require './jquery-extensions' +{$$, View} = require './space-pen-extensions' +fsUtils = require './fs-utils' +_ = require './underscore-extensions' telepath = require 'telepath' -{View} = require 'space-pen' -Buffer = require 'text-buffer' -Editor = require 'editor' -Project = require 'project' -Pane = require 'pane' -PaneColumn = require 'pane-column' -PaneRow = require 'pane-row' -PaneContainer = require 'pane-container' -EditSession = require 'edit-session' +Editor = require './editor' +Pane = require './pane' +PaneColumn = require './pane-column' +PaneRow = require './pane-row' +PaneContainer = require './pane-container' +EditSession = require './edit-session' # Public: The container for the entire Atom application. # diff --git a/src/scroll-view.coffee b/src/scroll-view.coffee index c41cc07ea..380669cfa 100644 --- a/src/scroll-view.coffee +++ b/src/scroll-view.coffee @@ -1,4 +1,4 @@ -{View} = require 'space-pen' +{View} = require './space-pen-extensions' # Public: Represents a view that scrolls. # diff --git a/src/select-list.coffee b/src/select-list.coffee index 074953a5d..6004aa55c 100644 --- a/src/select-list.coffee +++ b/src/select-list.coffee @@ -1,7 +1,7 @@ -$ = require 'jquery' -{ View } = require 'space-pen' -Editor = require 'editor' -fuzzyFilter = require 'fuzzy-filter' +$ = require './jquery-extensions' +{ View } = require './space-pen-extensions' +Editor = require './editor' +fuzzyFilter = require './fuzzy-filter' # Public: Provides a widget for users to make a selection from a list of # choices. diff --git a/src/selection-view.coffee b/src/selection-view.coffee index d93f141cc..e01ea384d 100644 --- a/src/selection-view.coffee +++ b/src/selection-view.coffee @@ -1,5 +1,5 @@ {Point, Range} = require 'telepath' -{View, $$} = require 'space-pen' +{View, $$} = require './space-pen-extensions' # Internal: module.exports = diff --git a/src/selection.coffee b/src/selection.coffee index 0192e2e7b..c48d05cf9 100644 --- a/src/selection.coffee +++ b/src/selection.coffee @@ -1,6 +1,6 @@ {Range} = require 'telepath' -EventEmitter = require 'event-emitter' -_ = require 'underscore' +EventEmitter = require './event-emitter' +_ = require './underscore-extensions' # Public: Represents a selection in the {EditSession}. module.exports = diff --git a/src/space-pen-extensions.coffee b/src/space-pen-extensions.coffee index e899373cb..a4d8f1047 100644 --- a/src/space-pen-extensions.coffee +++ b/src/space-pen-extensions.coffee @@ -1,8 +1,8 @@ -_ = require 'underscore' +_ = require './underscore-extensions' spacePen = require 'space-pen' -jQuery = require 'jquery' -ConfigObserver = require 'config-observer' -Subscriber = require 'subscriber' +jQuery = require './jquery-extensions' +ConfigObserver = require './config-observer' +Subscriber = require './subscriber' _.extend spacePen.View.prototype, ConfigObserver _.extend spacePen.View.prototype, Subscriber diff --git a/src/subscriber.coffee b/src/subscriber.coffee index c2c443ff3..d6335ba72 100644 --- a/src/subscriber.coffee +++ b/src/subscriber.coffee @@ -1,4 +1,4 @@ -_ = require 'underscore' +_ = require './underscore-extensions' module.exports = subscribeWith: (eventEmitter, methodName, args) -> diff --git a/src/syntax.coffee b/src/syntax.coffee index 1c55b6967..563468570 100644 --- a/src/syntax.coffee +++ b/src/syntax.coffee @@ -1,10 +1,10 @@ -_ = require 'underscore' -jQuery = require 'jquery' +_ = require './underscore-extensions' +jQuery = require './jquery-extensions' Specificity = require '../vendor/specificity' -{$$} = require 'space-pen' -fsUtils = require 'fs-utils' -EventEmitter = require 'event-emitter' -NullGrammar = require 'null-grammar' +{$$} = require './space-pen-extensions' +fsUtils = require './fs-utils' +EventEmitter = require './event-emitter' +NullGrammar = require './null-grammar' TextMateScopeSelector = require('first-mate').ScopeSelector ### Internal ### diff --git a/src/task.coffee b/src/task.coffee index d184330d8..588a9b8d4 100644 --- a/src/task.coffee +++ b/src/task.coffee @@ -1,6 +1,6 @@ -_ = require 'underscore' +_ = require './underscore-extensions' child_process = require 'child_process' -EventEmitter = require 'event-emitter' +EventEmitter = require './event-emitter' # Public: Run a node script in a separate process. # diff --git a/src/text-buffer.coffee b/src/text-buffer.coffee index 8b5ac5fdf..3bfb08563 100644 --- a/src/text-buffer.coffee +++ b/src/text-buffer.coffee @@ -1,10 +1,10 @@ -_ = require 'underscore' +_ = require './underscore–extensions' telepath = require 'telepath' {Point, Range} = telepath -fsUtils = require 'fs-utils' -File = require 'file' -EventEmitter = require 'event-emitter' -Subscriber = require 'subscriber' +fsUtils = require './fs-utils' +File = require './file' +EventEmitter = require './event-emitter' +Subscriber = require './subscriber' guid = require 'guid' # Private: Represents the contents of a file. diff --git a/src/text-mate-grammar.coffee b/src/text-mate-grammar.coffee index aecbffbf8..d9d362e68 100644 --- a/src/text-mate-grammar.coffee +++ b/src/text-mate-grammar.coffee @@ -1,10 +1,10 @@ -_ = require 'underscore' -fsUtils = require 'fs-utils' +_ = require './underscore-extensions' +fsUtils = require './fs-utils' plist = require 'plist' -Token = require 'token' +Token = require './token' {OnigRegExp, OnigScanner} = require 'oniguruma' path = require 'path' -EventEmitter = require 'event-emitter' +EventEmitter = require './event-emitter' {ScopeSelector} = require 'first-mate' pathSplitRegex = new RegExp("[#{path.sep}.]") diff --git a/src/text-mate-package.coffee b/src/text-mate-package.coffee index b715e1583..4e895aad6 100644 --- a/src/text-mate-package.coffee +++ b/src/text-mate-package.coffee @@ -1,8 +1,8 @@ -Package = require 'package' -fsUtils = require 'fs-utils' +Package = require './package' +fsUtils = require './fs-utils' path = require 'path' -_ = require 'underscore' -TextMateGrammar = require 'text-mate-grammar' +_ = require './underscore-extensions' +TextMateGrammar = require './text-mate-grammar' async = require 'async' ### Internal ### diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee index 5bc6e0f8f..66ed646c5 100644 --- a/src/theme-manager.coffee +++ b/src/theme-manager.coffee @@ -1,11 +1,11 @@ path = require 'path' -EventEmitter = require 'event-emitter' -Package = require 'package' -AtomPackage = require 'atom-package' +EventEmitter = require './event-emitter' +Package = require './package' +AtomPackage = require './atom-package' -_ = require 'underscore' +_ = require './underscore-extensions' -fsUtils = require 'fs-utils' +fsUtils = require './fs-utils' # Private: Handles discovering and loading available themes. module.exports = diff --git a/src/token.coffee b/src/token.coffee index 66dc0c984..141e6a756 100644 --- a/src/token.coffee +++ b/src/token.coffee @@ -1,5 +1,5 @@ -_ = require 'underscore' -textUtils = require 'text-utils' +_ = require './underscore-extensions' +textUtils = require './text-utils' whitespaceRegexesByTabLength = {} diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee index c4ac782cb..c84091e24 100644 --- a/src/tokenized-buffer.coffee +++ b/src/tokenized-buffer.coffee @@ -1,8 +1,8 @@ -_ = require 'underscore' -TokenizedLine = require 'tokenized-line' -EventEmitter = require 'event-emitter' -Subscriber = require 'subscriber' -Token = require 'token' +_ = require './underscore-extensions' +TokenizedLine = require './tokenized-line' +EventEmitter = require './event-emitter' +Subscriber = require './subscriber' +Token = require './token' telepath = require 'telepath' {Point, Range} = telepath diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee index 18bbecbcc..763b4a18c 100644 --- a/src/tokenized-line.coffee +++ b/src/tokenized-line.coffee @@ -1,4 +1,4 @@ -_ = require 'underscore' +_ = require './underscore-extensions' ### Internal ### diff --git a/src/window-bootstrap.coffee b/src/window-bootstrap.coffee index 579d7b79f..cf7cbdaa6 100644 --- a/src/window-bootstrap.coffee +++ b/src/window-bootstrap.coffee @@ -1,7 +1,7 @@ # Like sands through the hourglass, so are the days of our lives. date = new Date().getTime() -require 'atom' -require 'window' +require './atom' +require './window' window.setUpEnvironment('editor') window.startEditorWindow() diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee index fd0073035..3a8d301ef 100644 --- a/src/window-event-handler.coffee +++ b/src/window-event-handler.coffee @@ -1,9 +1,9 @@ -$ = require 'jquery' -_ = require 'underscore' +$ = require './jquery-extensions' +_ = require './underscore-extensions' ipc = require 'ipc' remote = require 'remote' -Subscriber = require 'subscriber' -fsUtils = require 'fs-utils' +Subscriber = require './subscriber' +fsUtils = require './fs-utils' # Private: Handles low-level events related to the window. module.exports = diff --git a/src/window.coffee b/src/window.coffee index e238d5115..c7a9cde6a 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -1,14 +1,11 @@ -fsUtils = require 'fs-utils' +fsUtils = require './fs-utils' path = require 'path' telepath = require 'telepath' -$ = require 'jquery' -_ = require 'underscore' +$ = require './jquery-extensions' +_ = require './underscore-extensions' remote = require 'remote' ipc = require 'ipc' -WindowEventHandler = require 'window-event-handler' -require 'jquery-extensions' -require 'underscore-extensions' -require 'space-pen-extensions' +WindowEventHandler = require './window-event-handler' deserializers = {} deferredDeserializers = {}