From 55f3311c019eb09fa8b5d21a76a5376860c30acb Mon Sep 17 00:00:00 2001 From: Indrek Ardel Date: Mon, 26 Sep 2016 20:52:13 +0300 Subject: [PATCH] Remove unused variables --- spec/atom-environment-spec.coffee | 2 -- spec/atom-portable-spec.coffee | 1 - spec/decoration-manager-spec.coffee | 1 - spec/git-repository-spec.coffee | 3 +-- spec/jasmine-test-runner.coffee | 1 - spec/lines-yardstick-spec.coffee | 3 --- spec/package-spec.coffee | 2 +- spec/pane-spec.coffee | 1 - spec/panel-container-element-spec.coffee | 2 -- spec/project-spec.coffee | 3 --- spec/selection-spec.coffee | 2 -- spec/spec-helper.coffee | 4 +--- spec/squirrel-update-spec.coffee | 1 - spec/task-spec.coffee | 1 - spec/text-editor-element-spec.coffee | 1 - spec/text-editor-presenter-spec.coffee | 5 ++--- spec/text-editor-spec.coffee | 6 ++---- spec/theme-manager-spec.coffee | 5 ----- spec/time-reporter.coffee | 2 +- spec/tokenized-buffer-spec.coffee | 3 --- spec/window-event-handler-spec.coffee | 6 +----- spec/workspace-spec.coffee | 2 -- src/application-delegate.coffee | 2 +- src/atom-environment.coffee | 4 +--- src/block-decorations-component.coffee | 5 ++--- src/command-registry.coffee | 1 - src/config.coffee | 5 ++--- src/context-menu-manager.coffee | 1 - src/cursor.coffee | 1 - src/git-repository.coffee | 2 +- src/grammar-registry.coffee | 1 - src/gutter-container-component.coffee | 2 +- src/initialize-application-window.coffee | 2 +- src/language-mode.coffee | 1 - src/layer-decoration.coffee | 2 -- src/line-number-gutter-component.coffee | 2 -- src/line-numbers-tile-component.coffee | 2 +- src/lines-component.coffee | 3 --- src/lines-tile-component.coffee | 6 ------ src/lines-yardstick.coffee | 1 - src/main-process/atom-application.coffee | 2 +- src/main-process/atom-protocol-handler.coffee | 2 +- src/main-process/atom-window.coffee | 2 +- src/notification-manager.coffee | 2 +- src/package-manager.coffee | 2 +- src/package.coffee | 2 -- src/pane-container.coffee | 3 +-- src/pane.coffee | 2 +- src/project.coffee | 3 --- src/register-default-commands.coffee | 1 + src/scan-handler.coffee | 2 -- src/scoped-properties.coffee | 1 - src/selection.coffee | 4 ++-- src/text-editor-component.coffee | 3 --- src/text-editor-element.coffee | 3 --- src/text-editor-presenter.coffee | 7 ++----- src/theme-manager.coffee | 2 +- src/token.coffee | 1 - src/tokenized-buffer.coffee | 2 -- src/tokenized-line.coffee | 2 -- src/view-registry.coffee | 1 - src/window-event-handler.coffee | 2 -- src/window-load-settings-helpers.coffee | 3 --- src/workspace-element.coffee | 3 +-- src/workspace.coffee | 2 -- 65 files changed, 33 insertions(+), 126 deletions(-) diff --git a/spec/atom-environment-spec.coffee b/spec/atom-environment-spec.coffee index 317aa705d..6715d04e2 100644 --- a/spec/atom-environment-spec.coffee +++ b/spec/atom-environment-spec.coffee @@ -1,8 +1,6 @@ _ = require 'underscore-plus' path = require 'path' temp = require 'temp' -Package = require '../src/package' -ThemeManager = require '../src/theme-manager' AtomEnvironment = require '../src/atom-environment' StorageFolder = require '../src/storage-folder' diff --git a/spec/atom-portable-spec.coffee b/spec/atom-portable-spec.coffee index 8f45f314e..aeb71b7c1 100644 --- a/spec/atom-portable-spec.coffee +++ b/spec/atom-portable-spec.coffee @@ -1,6 +1,5 @@ path = require 'path' fs = require 'fs-plus' -temp = require 'temp' AtomPortable = require '../src/main-process/atom-portable' portableModeCommonPlatformBehavior = (platform) -> diff --git a/spec/decoration-manager-spec.coffee b/spec/decoration-manager-spec.coffee index c428df8cf..44da440d9 100644 --- a/spec/decoration-manager-spec.coffee +++ b/spec/decoration-manager-spec.coffee @@ -1,5 +1,4 @@ DecorationManager = require '../src/decoration-manager' -_ = require 'underscore-plus' describe "DecorationManager", -> [decorationManager, buffer, defaultMarkerLayer] = [] diff --git a/spec/git-repository-spec.coffee b/spec/git-repository-spec.coffee index d427fc3b9..c9a3badb5 100644 --- a/spec/git-repository-spec.coffee +++ b/spec/git-repository-spec.coffee @@ -2,7 +2,6 @@ temp = require 'temp' GitRepository = require '../src/git-repository' fs = require 'fs-plus' path = require 'path' -Task = require '../src/task' Project = require '../src/project' copyRepository = -> @@ -195,7 +194,7 @@ describe "GitRepository", -> expect(repo.isStatusModified(repo.getDirectoryStatus(directoryPath))).toBe true describe ".refreshStatus()", -> - [newPath, modifiedPath, cleanPath, originalModifiedPathText, workingDirectory] = [] + [newPath, modifiedPath, cleanPath, workingDirectory] = [] beforeEach -> workingDirectory = copyRepository() diff --git a/spec/jasmine-test-runner.coffee b/spec/jasmine-test-runner.coffee index dd8386f5d..dcfe4448e 100644 --- a/spec/jasmine-test-runner.coffee +++ b/spec/jasmine-test-runner.coffee @@ -1,5 +1,4 @@ Grim = require 'grim' -_ = require 'underscore-plus' fs = require 'fs-plus' path = require 'path' {ipcRenderer} = require 'electron' diff --git a/spec/lines-yardstick-spec.coffee b/spec/lines-yardstick-spec.coffee index bb0294b54..ed50451e7 100644 --- a/spec/lines-yardstick-spec.coffee +++ b/spec/lines-yardstick-spec.coffee @@ -1,6 +1,5 @@ LinesYardstick = require '../src/lines-yardstick' LineTopIndex = require 'line-top-index' -{toArray} = require 'underscore-plus' {Point} = require 'text-buffer' describe "LinesYardstick", -> @@ -15,8 +14,6 @@ describe "LinesYardstick", -> runs -> createdLineNodes = [] - availableScreenRows = {} - screenRowsToMeasure = [] buildLineNode = (screenRow) -> startIndex = 0 diff --git a/spec/package-spec.coffee b/spec/package-spec.coffee index 57d7a661f..a0e7ffa4d 100644 --- a/spec/package-spec.coffee +++ b/spec/package-spec.coffee @@ -197,7 +197,7 @@ describe "Package", -> expect(spy).toHaveBeenCalled() describe ".loadMetadata()", -> - [packagePath, pack, metadata] = [] + [packagePath, metadata] = [] beforeEach -> packagePath = atom.project.getDirectories()[0]?.resolve('packages/package-with-different-directory-name') diff --git a/spec/pane-spec.coffee b/spec/pane-spec.coffee index ac4d502b9..d8f74db53 100644 --- a/spec/pane-spec.coffee +++ b/spec/pane-spec.coffee @@ -2,7 +2,6 @@ {Emitter} = require 'event-kit' Grim = require 'grim' Pane = require '../src/pane' -PaneAxis = require '../src/pane-axis' PaneContainer = require '../src/pane-container' describe "Pane", -> diff --git a/spec/panel-container-element-spec.coffee b/spec/panel-container-element-spec.coffee index 65577221a..55e6f7133 100644 --- a/spec/panel-container-element-spec.coffee +++ b/spec/panel-container-element-spec.coffee @@ -1,7 +1,5 @@ Panel = require '../src/panel' -PanelElement = require '../src/panel-element' PanelContainer = require '../src/panel-container' -PanelContainerElement = require '../src/panel-container-element' describe "PanelContainerElement", -> [jasmineContent, element, container] = [] diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee index e207b1555..30415a059 100644 --- a/spec/project-spec.coffee +++ b/spec/project-spec.coffee @@ -1,10 +1,7 @@ temp = require 'temp' -fstream = require 'fstream' Project = require '../src/project' -_ = require 'underscore-plus' fs = require 'fs-plus' path = require 'path' -BufferedProcess = require '../src/buffered-process' {Directory} = require 'pathwatcher' GitRepository = require '../src/git-repository' diff --git a/spec/selection-spec.coffee b/spec/selection-spec.coffee index 7511c4b39..f22b6f6b8 100644 --- a/spec/selection-spec.coffee +++ b/spec/selection-spec.coffee @@ -1,5 +1,3 @@ -TextEditor = require '../src/text-editor' - describe "Selection", -> [buffer, editor, selection] = [] diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index 55d3e8dbf..7dbd6a4e5 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -49,7 +49,7 @@ if process.env.CI else jasmine.getEnv().defaultTimeoutInterval = 5000 -{resourcePath, testPaths} = atom.getLoadSettings() +{testPaths} = atom.getLoadSettings() if specPackagePath = FindParentDir.sync(testPaths[0], 'package.json') packageMetadata = require(path.join(specPackagePath, 'package.json')) @@ -61,8 +61,6 @@ else specProjectPath = path.join(__dirname, 'fixtures') beforeEach -> - documentTitle = null - atom.project.setPaths([specProjectPath]) window.resetTimeouts() diff --git a/spec/squirrel-update-spec.coffee b/spec/squirrel-update-spec.coffee index 2fe944e41..083b1f78d 100644 --- a/spec/squirrel-update-spec.coffee +++ b/spec/squirrel-update-spec.coffee @@ -4,7 +4,6 @@ path = require 'path' temp = require 'temp' SquirrelUpdate = require '../src/main-process/squirrel-update' Spawner = require '../src/main-process/spawner' -WinPowerShell = require '../src/main-process/win-powershell' WinShell = require '../src/main-process/win-shell' # Run passed callback as Spawner.spawn() would do diff --git a/spec/task-spec.coffee b/spec/task-spec.coffee index 934589f2b..b2a974d60 100644 --- a/spec/task-spec.coffee +++ b/spec/task-spec.coffee @@ -8,7 +8,6 @@ describe "Task", -> task = Task.once require.resolve('./fixtures/task-spec-handler'), (result) -> handlerResult = result - processClosed = false processErrored = false childProcess = task.childProcess spyOn(childProcess, 'kill').andCallThrough() diff --git a/spec/text-editor-element-spec.coffee b/spec/text-editor-element-spec.coffee index 803285dd3..951b5ea36 100644 --- a/spec/text-editor-element-spec.coffee +++ b/spec/text-editor-element-spec.coffee @@ -1,5 +1,4 @@ TextEditorElement = require '../src/text-editor-element' -TextEditor = require '../src/text-editor' {Disposable} = require 'event-kit' # The rest of text-editor-component-spec will be moved to this file when React diff --git a/spec/text-editor-presenter-spec.coffee b/spec/text-editor-presenter-spec.coffee index 728768799..8cc5e5086 100644 --- a/spec/text-editor-presenter-spec.coffee +++ b/spec/text-editor-presenter-spec.coffee @@ -2,7 +2,6 @@ _ = require 'underscore-plus' randomWords = require 'random-words' TextBuffer = require 'text-buffer' {Point, Range} = TextBuffer -TextEditor = require '../src/text-editor' TextEditorPresenter = require '../src/text-editor-presenter' FakeLinesYardstick = require './fake-lines-yardstick' LineTopIndex = require 'line-top-index' @@ -1848,7 +1847,7 @@ describe "TextEditorPresenter", -> describe ".highlights", -> expectUndefinedStateForHighlight = (presenter, decoration) -> - for tileId, tileState of getState(presenter).content.tiles + for tileId of getState(presenter).content.tiles state = stateForHighlightInTile(presenter, decoration, tileId) expect(state).toBeUndefined() @@ -1860,7 +1859,7 @@ describe "TextEditorPresenter", -> stateForHighlightInTile(presenter, selection.decoration, tile) expectUndefinedStateForSelection = (presenter, selectionIndex) -> - for tileId, tileState of getState(presenter).content.tiles + for tileId of getState(presenter).content.tiles state = stateForSelectionInTile(presenter, selectionIndex, tileId) expect(state).toBeUndefined() diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 1737abe7c..baa8e45b4 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -1,6 +1,4 @@ -fs = require 'fs-plus' path = require 'path' -temp = require 'temp' clipboard = require '../src/safe-clipboard' TextEditor = require '../src/text-editor' TextBuffer = require 'text-buffer' @@ -4751,7 +4749,7 @@ describe "TextEditor", -> it "deletes the entire file from the bottom up", -> count = buffer.getLineCount() expect(count).toBeGreaterThan(0) - for line in [0...count] + for [0...count] editor.getLastCursor().moveToBottom() editor.deleteLine() expect(buffer.getLineCount()).toBe(1) @@ -4760,7 +4758,7 @@ describe "TextEditor", -> it "deletes the entire file from the top down", -> count = buffer.getLineCount() expect(count).toBeGreaterThan(0) - for line in [0...count] + for [0...count] editor.getLastCursor().moveToTop() editor.deleteLine() expect(buffer.getLineCount()).toBe(1) diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee index 47b848809..68693dddc 100644 --- a/spec/theme-manager-spec.coffee +++ b/spec/theme-manager-spec.coffee @@ -2,12 +2,7 @@ path = require 'path' fs = require 'fs-plus' temp = require 'temp' -Package = require '../src/package' - describe "atom.themes", -> - resourcePath = atom.getLoadSettings().resourcePath - configDirPath = atom.getConfigDirPath() - beforeEach -> spyOn(console, 'warn') diff --git a/spec/time-reporter.coffee b/spec/time-reporter.coffee index e1e9c6a0e..16943c18b 100644 --- a/spec/time-reporter.coffee +++ b/spec/time-reporter.coffee @@ -60,7 +60,7 @@ class TimeReporter extends jasmine.Reporter time: duration fullName: spec.getFullName() - if timedSuites[@suite] + if window.timedSuites[@suite] window.timedSuites[@suite] += duration else window.timedSuites[@suite] = duration diff --git a/spec/tokenized-buffer-spec.coffee b/spec/tokenized-buffer-spec.coffee index 9a2845d16..ad9fa0ee7 100644 --- a/spec/tokenized-buffer-spec.coffee +++ b/spec/tokenized-buffer-spec.coffee @@ -499,10 +499,7 @@ describe "TokenizedBuffer", -> expect(tokenizedBuffer.indentLevelForRow(10)).toBe 2 # } describe "::isFoldableAtRow(row)", -> - changes = null - beforeEach -> - changes = [] buffer = atom.project.bufferForPathSync('sample.js') buffer.insert [10, 0], " // multi-line\n // comment\n // block\n" buffer.insert [0, 0], "// multi-line\n// comment\n// block\n" diff --git a/spec/window-event-handler-spec.coffee b/spec/window-event-handler-spec.coffee index 706eb781e..8e08fec35 100644 --- a/spec/window-event-handler-spec.coffee +++ b/spec/window-event-handler-spec.coffee @@ -1,13 +1,10 @@ KeymapManager = require 'atom-keymap' -path = require 'path' -fs = require 'fs-plus' -temp = require 'temp' TextEditor = require '../src/text-editor' WindowEventHandler = require '../src/window-event-handler' {ipcRenderer} = require 'electron' describe "WindowEventHandler", -> - [projectPath, windowEventHandler] = [] + [windowEventHandler] = [] beforeEach -> atom.uninstallWindowEventHandler() @@ -19,7 +16,6 @@ describe "WindowEventHandler", -> loadSettings atom.project.destroy() windowEventHandler = new WindowEventHandler({atomEnvironment: atom, applicationDelegate: atom.applicationDelegate, window, document}) - projectPath = atom.project.getPaths()[0] afterEach -> windowEventHandler.unsubscribe() diff --git a/spec/workspace-spec.coffee b/spec/workspace-spec.coffee index ff9b957bf..fe4c661c6 100644 --- a/spec/workspace-spec.coffee +++ b/spec/workspace-spec.coffee @@ -2,7 +2,6 @@ path = require 'path' temp = require 'temp' Workspace = require '../src/workspace' Project = require '../src/project' -Pane = require '../src/pane' platform = require './spec-helper-platform' _ = require 'underscore-plus' fstream = require 'fstream' @@ -1241,7 +1240,6 @@ describe "Workspace", -> expect(matches.length).toBe 1 it "excludes values in core.ignoredNames", -> - projectPath = path.join(__dirname, 'fixtures', 'git', 'working-dir') ignoredNames = atom.config.get("core.ignoredNames") ignoredNames.push("a") atom.config.set("core.ignoredNames", ignoredNames) diff --git a/src/application-delegate.coffee b/src/application-delegate.coffee index 7e7bdbea8..5d908a2c9 100644 --- a/src/application-delegate.coffee +++ b/src/application-delegate.coffee @@ -1,5 +1,5 @@ _ = require 'underscore-plus' -{screen, ipcRenderer, remote, shell, systemPreferences, webFrame} = require 'electron' +{screen, ipcRenderer, remote, shell, webFrame} = require 'electron' ipcHelpers = require './ipc-helpers' {Disposable} = require 'event-kit' {getWindowLoadSettings, setWindowLoadSettings} = require './window-load-settings-helpers' diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index 63bb7141c..e3d0fa5e8 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -9,10 +9,9 @@ fs = require 'fs-plus' {mapSourcePosition} = require 'source-map-support' Model = require './model' WindowEventHandler = require './window-event-handler' -StylesElement = require './styles-element' StateStore = require './state-store' StorageFolder = require './storage-folder' -{getWindowLoadSettings, setWindowLoadSettings} = require './window-load-settings-helpers' +{getWindowLoadSettings} = require './window-load-settings-helpers' registerDefaultCommands = require './register-default-commands' DeserializerManager = require './deserializer-manager' @@ -51,7 +50,6 @@ PanelElement = require './panel-element' PaneContainerElement = require './pane-container-element' PaneAxisElement = require './pane-axis-element' PaneElement = require './pane-element' -TextEditorElement = require './text-editor-element' {createGutterView} = require './gutter-component-helpers' # Essential: Atom global for dealing with packages, themes, menus, and the window. diff --git a/src/block-decorations-component.coffee b/src/block-decorations-component.coffee index 35aec3921..48bbf77f3 100644 --- a/src/block-decorations-component.coffee +++ b/src/block-decorations-component.coffee @@ -24,7 +24,7 @@ class BlockDecorationsComponent @domNode.style.width = @newState.width + "px" @oldState.width = @newState.width - for id, blockDecorationState of @oldState.blockDecorations + for id of @oldState.blockDecorations unless @newState.blockDecorations.hasOwnProperty(id) blockDecorationNode = @blockDecorationNodesById[id] blockDecorationNode.previousSibling.remove() @@ -33,7 +33,7 @@ class BlockDecorationsComponent delete @blockDecorationNodesById[id] delete @oldState.blockDecorations[id] - for id, blockDecorationState of @newState.blockDecorations + for id of @newState.blockDecorations if @oldState.blockDecorations.hasOwnProperty(id) @updateBlockDecorationNode(id) else @@ -42,7 +42,6 @@ class BlockDecorationsComponent measureBlockDecorations: -> for decorationId, blockDecorationNode of @blockDecorationNodesById - style = getComputedStyle(blockDecorationNode) decoration = @newState.blockDecorations[decorationId].decoration topRuler = blockDecorationNode.previousSibling bottomRuler = blockDecorationNode.nextSibling diff --git a/src/command-registry.coffee b/src/command-registry.coffee index 955a1b540..056446203 100644 --- a/src/command-registry.coffee +++ b/src/command-registry.coffee @@ -214,7 +214,6 @@ class CommandRegistry immediatePropagationStopped = false matched = false currentTarget = event.target - {preventDefault, stopPropagation, stopImmediatePropagation, abortKeyBinding} = event dispatchedEvent = new CustomEvent(event.type, {bubbles: true, detail: event.detail}) Object.defineProperty dispatchedEvent, 'eventPhase', value: Event.BUBBLING_PHASE diff --git a/src/config.coffee b/src/config.coffee index 1d314ada1..2dc537dd4 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -1,6 +1,6 @@ _ = require 'underscore-plus' fs = require 'fs-plus' -{CompositeDisposable, Disposable, Emitter} = require 'event-kit' +{Emitter} = require 'event-kit' CSON = require 'season' path = require 'path' async = require 'async' @@ -561,7 +561,7 @@ class Config # * `scopeDescriptor` The {ScopeDescriptor} with which the value is associated # * `value` The value for the key-path getAll: (keyPath, options) -> - {scope, sources} = options if options? + {scope} = options if options? result = [] if scope? @@ -1045,7 +1045,6 @@ class Config resetSettingsForSchemaChange: (source=@getUserConfigPath()) -> @transact => @settings = @makeValueConformToSchema(null, @settings, suppressException: true) - priority = @priorityForSource(source) selectorsAndSettings = @scopedSettingsStore.propertiesForSource(source) @scopedSettingsStore.removePropertiesForSource(source) for scopeSelector, settings of selectorsAndSettings diff --git a/src/context-menu-manager.coffee b/src/context-menu-manager.coffee index 64360dd2e..4dc54cede 100644 --- a/src/context-menu-manager.coffee +++ b/src/context-menu-manager.coffee @@ -1,4 +1,3 @@ -_ = require 'underscore-plus' path = require 'path' CSON = require 'season' fs = require 'fs-plus' diff --git a/src/cursor.coffee b/src/cursor.coffee index 1176704c9..85573f10e 100644 --- a/src/cursor.coffee +++ b/src/cursor.coffee @@ -682,7 +682,6 @@ class Cursor extends Model {row, column} = start scanRange = [[row-1, column], [0, 0]] position = new Point(0, 0) - zero = new Point(0, 0) @editor.backwardsScanInBufferRange EmptyLineRegExp, scanRange, ({range, stop}) -> position = range.start.traverse(Point(1, 0)) stop() unless position.isEqual(start) diff --git a/src/git-repository.coffee b/src/git-repository.coffee index e9d979171..d47b2e37c 100644 --- a/src/git-repository.coffee +++ b/src/git-repository.coffee @@ -1,4 +1,4 @@ -{basename, join} = require 'path' +{join} = require 'path' _ = require 'underscore-plus' {Emitter, Disposable, CompositeDisposable} = require 'event-kit' diff --git a/src/grammar-registry.coffee b/src/grammar-registry.coffee index 1876e1d74..899bb4cff 100644 --- a/src/grammar-registry.coffee +++ b/src/grammar-registry.coffee @@ -1,5 +1,4 @@ _ = require 'underscore-plus' -{Emitter} = require 'event-kit' FirstMate = require 'first-mate' Token = require './token' fs = require 'fs-plus' diff --git a/src/gutter-container-component.coffee b/src/gutter-container-component.coffee index c5538324b..56b0fea84 100644 --- a/src/gutter-container-component.coffee +++ b/src/gutter-container-component.coffee @@ -18,7 +18,7 @@ class GutterContainerComponent @domNode.style.display = 'flex' destroy: -> - for {name, component} in @gutterComponents + for {component} in @gutterComponents component.destroy?() return diff --git a/src/initialize-application-window.coffee b/src/initialize-application-window.coffee index 04784efa0..63cfa1c2e 100644 --- a/src/initialize-application-window.coffee +++ b/src/initialize-application-window.coffee @@ -5,7 +5,7 @@ module.exports = ({blobStore}) -> require './window' {getWindowLoadSettings} = require './window-load-settings-helpers' {ipcRenderer} = require 'electron' - {resourcePath, isSpec, devMode, env} = getWindowLoadSettings() + {resourcePath, devMode, env} = getWindowLoadSettings() require '../src/electron-shims' updateProcessEnv(env) diff --git a/src/language-mode.coffee b/src/language-mode.coffee index a3ba2e664..0e1013cca 100644 --- a/src/language-mode.coffee +++ b/src/language-mode.coffee @@ -253,7 +253,6 @@ class LanguageMode iterator.next() scopeDescriptor = new ScopeDescriptor(scopes: iterator.getScopes()) - patterns = increaseIndentRegex = @increaseIndentRegexForScopeDescriptor(scopeDescriptor) decreaseIndentRegex = @decreaseIndentRegexForScopeDescriptor(scopeDescriptor) decreaseNextIndentRegex = @decreaseNextIndentRegexForScopeDescriptor(scopeDescriptor) diff --git a/src/layer-decoration.coffee b/src/layer-decoration.coffee index e00e024cb..fb544948f 100644 --- a/src/layer-decoration.coffee +++ b/src/layer-decoration.coffee @@ -1,5 +1,3 @@ -_ = require 'underscore-plus' - idCounter = 0 nextId = -> idCounter++ diff --git a/src/line-number-gutter-component.coffee b/src/line-number-gutter-component.coffee index 3a3c199c2..b74747770 100644 --- a/src/line-number-gutter-component.coffee +++ b/src/line-number-gutter-component.coffee @@ -1,7 +1,5 @@ TiledComponent = require './tiled-component' LineNumbersTileComponent = require './line-numbers-tile-component' -WrapperDiv = document.createElement('div') -DOMElementPool = require './dom-element-pool' module.exports = class LineNumberGutterComponent extends TiledComponent diff --git a/src/line-numbers-tile-component.coffee b/src/line-numbers-tile-component.coffee index 30f13fff2..d552e2056 100644 --- a/src/line-numbers-tile-component.coffee +++ b/src/line-numbers-tile-component.coffee @@ -96,7 +96,7 @@ class LineNumbersTileComponent screenRowForNode: (node) -> parseInt(node.dataset.screenRow) buildLineNumberNode: (lineNumberState) -> - {screenRow, bufferRow, softWrapped, top, decorationClasses, zIndex, blockDecorationsHeight} = lineNumberState + {screenRow, bufferRow, softWrapped, blockDecorationsHeight} = lineNumberState className = @buildLineNumberClassName(lineNumberState) lineNumberNode = @domElementPool.buildElement("div", className) diff --git a/src/lines-component.coffee b/src/lines-component.coffee index 2ef5fcdc4..fb9b28b03 100644 --- a/src/lines-component.coffee +++ b/src/lines-component.coffee @@ -15,8 +15,6 @@ DummyLineNode.children[1].textContent = '我' DummyLineNode.children[2].textContent = 'ﾊ' DummyLineNode.children[3].textContent = '세' -RangeForMeasurement = document.createRange() - module.exports = class LinesComponent extends TiledComponent placeholderTextDiv: null @@ -77,7 +75,6 @@ class LinesComponent extends TiledComponent measureLineHeightAndDefaultCharWidth: -> @domNode.appendChild(DummyLineNode) - textNode = DummyLineNode.firstChild.childNodes[0] lineHeightInPixels = DummyLineNode.getBoundingClientRect().height defaultCharWidth = DummyLineNode.children[0].getBoundingClientRect().width diff --git a/src/lines-tile-component.coffee b/src/lines-tile-component.coffee index 64c1e59bd..c1cb2ba64 100644 --- a/src/lines-tile-component.coffee +++ b/src/lines-tile-component.coffee @@ -1,9 +1,4 @@ -_ = require 'underscore-plus' - HighlightsComponent = require './highlights-component' -AcceptFilter = {acceptNode: -> NodeFilter.FILTER_ACCEPT} -TokenTextEscapeRegex = /[&"'<>]/g -MaxTokenLength = 20000 ZERO_WIDTH_NBSP = '\ufeff' cloneObject = (object) -> @@ -201,7 +196,6 @@ class LinesTileComponent lineNode.classList.add(decorationClass) textNodes = [] - lineLength = 0 startIndex = 0 openScopeNode = lineNode for tagCode in tagCodes when tagCode isnt 0 diff --git a/src/lines-yardstick.coffee b/src/lines-yardstick.coffee index 098fc2288..551733a55 100644 --- a/src/lines-yardstick.coffee +++ b/src/lines-yardstick.coffee @@ -18,7 +18,6 @@ class LinesYardstick screenPositionForPixelPosition: (pixelPosition) -> targetTop = pixelPosition.top targetLeft = pixelPosition.left - defaultCharWidth = @model.getDefaultCharWidth() row = @lineTopIndex.rowForPixelPosition(targetTop) targetLeft = 0 if targetTop < 0 or targetLeft < 0 targetLeft = Infinity if row > @model.getLastScreenRow() diff --git a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee index 42189f299..16b320c53 100644 --- a/src/main-process/atom-application.coffee +++ b/src/main-process/atom-application.coffee @@ -62,7 +62,7 @@ class AtomApplication exit: (status) -> app.exit(status) constructor: (options) -> - {@resourcePath, @devResourcePath, @version, @devMode, @safeMode, @socketPath, @logFile, @setPortable, @userDataDir, timeout, clearWindowState} = options + {@resourcePath, @devResourcePath, @version, @devMode, @safeMode, @socketPath, @logFile, @setPortable, @userDataDir} = options @socketPath = null if options.test @pidsToOpenWindows = {} @windows = [] diff --git a/src/main-process/atom-protocol-handler.coffee b/src/main-process/atom-protocol-handler.coffee index 3967c0525..db385b4b7 100644 --- a/src/main-process/atom-protocol-handler.coffee +++ b/src/main-process/atom-protocol-handler.coffee @@ -1,4 +1,4 @@ -{app, protocol} = require 'electron' +{protocol} = require 'electron' fs = require 'fs' path = require 'path' diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee index 7f525a396..3c163ba25 100644 --- a/src/main-process/atom-window.coffee +++ b/src/main-process/atom-window.coffee @@ -16,7 +16,7 @@ class AtomWindow isSpec: null constructor: (@atomApplication, @fileRecoveryService, settings={}) -> - {@resourcePath, initialPaths, pathToOpen, locationsToOpen, @isSpec, @headless, @safeMode, @devMode} = settings + {@resourcePath, pathToOpen, locationsToOpen, @isSpec, @headless, @safeMode, @devMode} = settings locationsToOpen ?= [{pathToOpen}] if pathToOpen locationsToOpen ?= [] diff --git a/src/notification-manager.coffee b/src/notification-manager.coffee index 1cb144bdc..4beab82b9 100644 --- a/src/notification-manager.coffee +++ b/src/notification-manager.coffee @@ -1,4 +1,4 @@ -{Emitter, Disposable} = require 'event-kit' +{Emitter} = require 'event-kit' Notification = require '../src/notification' # Public: A notification manager used to create {Notification}s to be shown diff --git a/src/package-manager.coffee b/src/package-manager.coffee index a2e792e26..f6cf41655 100644 --- a/src/package-manager.coffee +++ b/src/package-manager.coffee @@ -284,7 +284,7 @@ class PackageManager packagePaths.push(packagePath) if fs.isDirectorySync(packagePath) packagesPath = path.join(@resourcePath, 'node_modules') - for packageName, packageVersion of @getPackageDependencies() + for packageName of @getPackageDependencies() packagePath = path.join(packagesPath, packageName) packagePaths.push(packagePath) if fs.isDirectorySync(packagePath) diff --git a/src/package.coffee b/src/package.coffee index 3933ceac2..323dfa8d2 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -422,8 +422,6 @@ class Package @settingsActivated = false reloadStylesheets: -> - oldSheets = _.clone(@stylesheets) - try @loadStylesheets() catch error diff --git a/src/pane-container.coffee b/src/pane-container.coffee index 522c7c2cf..fc092122e 100644 --- a/src/pane-container.coffee +++ b/src/pane-container.coffee @@ -1,6 +1,5 @@ -{find, flatten} = require 'underscore-plus' +{find} = require 'underscore-plus' {Emitter, CompositeDisposable} = require 'event-kit' -Gutter = require './gutter' Model = require './model' Pane = require './pane' ItemRegistry = require './item-registry' diff --git a/src/pane.coffee b/src/pane.coffee index f7487a6e1..e4003ad35 100644 --- a/src/pane.coffee +++ b/src/pane.coffee @@ -21,7 +21,7 @@ class Pane extends Model focused: false @deserialize: (state, {deserializers, applicationDelegate, config, notifications}) -> - {items, itemStackIndices, activeItemIndex, activeItemURI, activeItemUri} = state + {items, activeItemIndex, activeItemURI, activeItemUri} = state activeItemURI ?= activeItemUri items = items.map (itemState) -> deserializers.deserialize(itemState) state.activeItem = items[activeItemIndex] diff --git a/src/project.coffee b/src/project.coffee index ff085c0a1..52a3223e0 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -1,5 +1,4 @@ path = require 'path' -url = require 'url' _ = require 'underscore-plus' fs = require 'fs-plus' @@ -8,8 +7,6 @@ TextBuffer = require 'text-buffer' DefaultDirectoryProvider = require './default-directory-provider' Model = require './model' -TextEditor = require './text-editor' -Task = require './task' GitRepositoryProvider = require './git-repository-provider' # Extended: Represents a project that's opened in Atom. diff --git a/src/register-default-commands.coffee b/src/register-default-commands.coffee index 2b05f6f0f..3ba50d497 100644 --- a/src/register-default-commands.coffee +++ b/src/register-default-commands.coffee @@ -1,4 +1,5 @@ {ipcRenderer} = require 'electron' +Grim = require 'grim' module.exports = ({commandRegistry, commandInstaller, config, notificationManager, project, clipboard}) -> commandRegistry.add 'atom-workspace', diff --git a/src/scan-handler.coffee b/src/scan-handler.coffee index 18e00dedc..8ee8f715e 100644 --- a/src/scan-handler.coffee +++ b/src/scan-handler.coffee @@ -5,8 +5,6 @@ async = require "async" module.exports = (rootPaths, regexSource, options) -> callback = @async() - rootPath = rootPaths[0] - PATHS_COUNTER_SEARCHED_CHUNK = 50 pathsSearched = 0 diff --git a/src/scoped-properties.coffee b/src/scoped-properties.coffee index c7257083e..f8f8b4311 100644 --- a/src/scoped-properties.coffee +++ b/src/scoped-properties.coffee @@ -1,5 +1,4 @@ CSON = require 'season' -{CompositeDisposable} = require 'event-kit' module.exports = class ScopedProperties diff --git a/src/selection.coffee b/src/selection.coffee index 8e9bf827e..d63605a86 100644 --- a/src/selection.coffee +++ b/src/selection.coffee @@ -512,7 +512,7 @@ class Selection extends Model joinMarker = @editor.markBufferRange(selectedRange, invalidate: 'never') rowCount = Math.max(1, selectedRange.getRowCount() - 1) - for row in [0...rowCount] + for [0...rowCount] @cursor.setBufferPosition([selectedRange.start.row]) @cursor.moveToEndOfLine() @@ -656,7 +656,7 @@ class Selection extends Model # * `autoIndent` If `true`, the line is indented to an automatically-inferred # level. Otherwise, {TextEditor::getTabText} is inserted. indent: ({autoIndent}={}) -> - {row, column} = @cursor.getBufferPosition() + {row} = @cursor.getBufferPosition() if @isEmpty() @cursor.skipLeadingWhitespace() diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee index 574e81a73..d2647d767 100644 --- a/src/text-editor-component.coffee +++ b/src/text-editor-component.coffee @@ -1,4 +1,3 @@ -_ = require 'underscore-plus' scrollbarStyle = require 'scrollbar-style' {Range, Point} = require 'text-buffer' {CompositeDisposable} = require 'event-kit' @@ -343,8 +342,6 @@ class TextEditorComponent @scopedConfigDisposables = new CompositeDisposable @disposables.add(@scopedConfigDisposables) - scope = @editor.getRootScopeDescriptor() - focused: -> if @mounted @presenter.setFocused(true) diff --git a/src/text-editor-element.coffee b/src/text-editor-element.coffee index 5d8254f7c..27a29bed6 100644 --- a/src/text-editor-element.coffee +++ b/src/text-editor-element.coffee @@ -1,8 +1,5 @@ {Emitter, CompositeDisposable} = require 'event-kit' -Path = require 'path' -{defaults} = require 'underscore-plus' TextBuffer = require 'text-buffer' -TextEditor = require './text-editor' TextEditorComponent = require './text-editor-component' StylesElement = require './styles-element' diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee index 2c8ec44d5..90de3fd91 100644 --- a/src/text-editor-presenter.coffee +++ b/src/text-editor-presenter.coffee @@ -1,4 +1,4 @@ -{CompositeDisposable, Disposable, Emitter} = require 'event-kit' +{CompositeDisposable, Emitter} = require 'event-kit' {Point, Range} = require 'text-buffer' _ = require 'underscore-plus' Decoration = require './decoration' @@ -886,13 +886,11 @@ class TextEditorPresenter setHorizontalScrollbarHeight: (horizontalScrollbarHeight) -> unless @measuredHorizontalScrollbarHeight is horizontalScrollbarHeight - oldHorizontalScrollbarHeight = @measuredHorizontalScrollbarHeight @measuredHorizontalScrollbarHeight = horizontalScrollbarHeight @emitDidUpdateState() setVerticalScrollbarWidth: (verticalScrollbarWidth) -> unless @measuredVerticalScrollbarWidth is verticalScrollbarWidth - oldVerticalScrollbarWidth = @measuredVerticalScrollbarWidth @measuredVerticalScrollbarWidth = verticalScrollbarWidth @emitDidUpdateState() @@ -922,7 +920,6 @@ class TextEditorPresenter setContentFrameWidth: (contentFrameWidth) -> if @contentFrameWidth isnt contentFrameWidth or @editorWidthInChars? - oldContentFrameWidth = @contentFrameWidth @contentFrameWidth = contentFrameWidth @editorWidthInChars = null @updateScrollbarDimensions() @@ -1122,7 +1119,7 @@ class TextEditorPresenter @updateHighlightState(decorationId, properties, screenRange) for tileId, tileState of @state.content.tiles - for id, highlight of tileState.highlights + for id of tileState.highlights delete tileState.highlights[id] unless @visibleHighlights[tileId]?[id]? return diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee index fbc722365..32fabf724 100644 --- a/src/theme-manager.coffee +++ b/src/theme-manager.coffee @@ -1,6 +1,6 @@ path = require 'path' _ = require 'underscore-plus' -{Emitter, Disposable, CompositeDisposable} = require 'event-kit' +{Emitter, CompositeDisposable} = require 'event-kit' {File} = require 'pathwatcher' fs = require 'fs-plus' diff --git a/src/token.coffee b/src/token.coffee index d531ba04a..902f54fa2 100644 --- a/src/token.coffee +++ b/src/token.coffee @@ -1,7 +1,6 @@ _ = require 'underscore-plus' StartDotRegex = /^\.?/ -WhitespaceRegex = /\S/ # Represents a single unit of text as selected by a grammar. module.exports = diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee index 86b3c3701..20df76c66 100644 --- a/src/tokenized-buffer.coffee +++ b/src/tokenized-buffer.coffee @@ -1,11 +1,9 @@ _ = require 'underscore-plus' {CompositeDisposable, Emitter} = require 'event-kit' {Point, Range} = require 'text-buffer' -{ScopeSelector} = require 'first-mate' Model = require './model' TokenizedLine = require './tokenized-line' TokenIterator = require './token-iterator' -Token = require './token' ScopeDescriptor = require './scope-descriptor' TokenizedBufferIterator = require './tokenized-buffer-iterator' NullGrammar = require './null-grammar' diff --git a/src/tokenized-line.coffee b/src/tokenized-line.coffee index f8faad865..a65b3a793 100644 --- a/src/tokenized-line.coffee +++ b/src/tokenized-line.coffee @@ -1,5 +1,3 @@ -_ = require 'underscore-plus' -{isPairedCharacter, isCJKCharacter} = require './text-utils' Token = require './token' CommentScopeRegex = /(\b|\.)comment/ diff --git a/src/view-registry.coffee b/src/view-registry.coffee index f5f8651df..e2cd986dc 100644 --- a/src/view-registry.coffee +++ b/src/view-registry.coffee @@ -1,4 +1,3 @@ -{find} = require 'underscore-plus' Grim = require 'grim' {Disposable} = require 'event-kit' _ = require 'underscore-plus' diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee index ac9221d15..559c8ac29 100644 --- a/src/window-event-handler.coffee +++ b/src/window-event-handler.coffee @@ -1,6 +1,4 @@ -path = require 'path' {Disposable, CompositeDisposable} = require 'event-kit' -fs = require 'fs-plus' listen = require './delegated-listener' # Handles low-level events related to the @window. diff --git a/src/window-load-settings-helpers.coffee b/src/window-load-settings-helpers.coffee index 73fd31a3d..639dc751d 100644 --- a/src/window-load-settings-helpers.coffee +++ b/src/window-load-settings-helpers.coffee @@ -1,6 +1,3 @@ -{remote} = require 'electron' -_ = require 'underscore-plus' - windowLoadSettings = null exports.getWindowLoadSettings = -> diff --git a/src/workspace-element.coffee b/src/workspace-element.coffee index 2435c94bf..ab8e39532 100644 --- a/src/workspace-element.coffee +++ b/src/workspace-element.coffee @@ -1,8 +1,7 @@ {ipcRenderer} = require 'electron' path = require 'path' fs = require 'fs-plus' -{Disposable, CompositeDisposable} = require 'event-kit' -Grim = require 'grim' +{CompositeDisposable} = require 'event-kit' scrollbarStyle = require 'scrollbar-style' module.exports = diff --git a/src/workspace.coffee b/src/workspace.coffee index 7439a6c53..c279e8062 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -1,7 +1,6 @@ _ = require 'underscore-plus' url = require 'url' path = require 'path' -{join} = path {Emitter, Disposable, CompositeDisposable} = require 'event-kit' fs = require 'fs-plus' {Directory} = require 'pathwatcher' @@ -9,7 +8,6 @@ DefaultDirectorySearcher = require './default-directory-searcher' Model = require './model' TextEditor = require './text-editor' PaneContainer = require './pane-container' -Pane = require './pane' Panel = require './panel' PanelContainer = require './panel-container' Task = require './task'