mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
@@ -9,7 +9,7 @@ module.exports = function () {
|
||||
const chromedriverVer = buildMetadata.dependencies['electron-chromedriver']
|
||||
const mksnapshotVer = buildMetadata.dependencies['electron-mksnapshot']
|
||||
|
||||
// Always use tilde on electron-chromedriver so that it can pick up the best patch vesion
|
||||
// Always use tilde on electron-chromedriver so that it can pick up the best patch version
|
||||
if (!chromedriverVer.startsWith('~')) {
|
||||
throw new Error(`electron-chromedriver version in script/package.json should start with a tilde to match latest patch version.`)
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ module.exports = function () {
|
||||
const rootPackageBackup = backupNodeModules(rootPackagePath)
|
||||
const intermediatePackageBackup = backupNodeModules(intermediatePackagePath)
|
||||
|
||||
// Run `apm install` in the *root* pacakge's path, so we get devDeps w/o apm's weird caching
|
||||
// Run `apm install` in the *root* package's path, so we get devDeps w/o apm's weird caching
|
||||
// Then copy this folder into the intermediate package's path so we can run the transpilation in-line.
|
||||
runApmInstall(rootPackagePath)
|
||||
if (fs.existsSync(intermediatePackageBackup.nodeModulesPath)) {
|
||||
|
||||
@@ -359,13 +359,13 @@ describe "LanguageMode", ->
|
||||
expect([fold.start.row, fold.end.row]).toEqual [1, 9]
|
||||
|
||||
describe "when bufferRow can't be folded", ->
|
||||
it "searches upward for the first row that begins a syntatic region containing the given buffer row (and folds it)", ->
|
||||
it "searches upward for the first row that begins a syntactic region containing the given buffer row (and folds it)", ->
|
||||
languageMode.foldBufferRow(8)
|
||||
[fold] = languageMode.unfoldAll()
|
||||
expect([fold.start.row, fold.end.row]).toEqual [1, 9]
|
||||
|
||||
describe "when the bufferRow is already folded", ->
|
||||
it "searches upward for the first row that begins a syntatic region containing the folded row (and folds it)", ->
|
||||
it "searches upward for the first row that begins a syntactic region containing the folded row (and folds it)", ->
|
||||
languageMode.foldBufferRow(2)
|
||||
expect(editor.isFoldedAtBufferRow(0)).toBe(false)
|
||||
expect(editor.isFoldedAtBufferRow(1)).toBe(true)
|
||||
@@ -381,7 +381,7 @@ describe "LanguageMode", ->
|
||||
expect([fold.start.row, fold.end.row]).toEqual [1, 3]
|
||||
|
||||
describe "when the bufferRow is a single-line comment", ->
|
||||
it "searches upward for the first row that begins a syntatic region containing the folded row (and folds it)", ->
|
||||
it "searches upward for the first row that begins a syntactic region containing the folded row (and folds it)", ->
|
||||
buffer.insert([1, 0], " //this is a single line comment\n")
|
||||
languageMode.foldBufferRow(1)
|
||||
[fold] = languageMode.unfoldAll()
|
||||
|
||||
@@ -172,7 +172,7 @@ describe "PaneContainerElement", ->
|
||||
lowerPane = leftPane.splitDown()
|
||||
expectPaneScale [lowerPane, 1], [leftPane, 1], [leftPane.getParent(), 0.5]
|
||||
|
||||
# dynamically close pane, the pane's flexscale will recorver to origin value
|
||||
# dynamically close pane, the pane's flexscale will recover to origin value
|
||||
waitsForPromise -> lowerPane.close()
|
||||
runs -> expectPaneScale [leftPane, 0.5], [rightPane, 1.5]
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ describe('Panel', () => {
|
||||
expect(spy).toHaveBeenCalledWith(false)
|
||||
})
|
||||
|
||||
it('initially renders panel created with visibile: false', () => {
|
||||
it('initially renders panel created with visible: false', () => {
|
||||
const panel = new Panel({visible: false, item: new TestPanelItem()}, atom.views)
|
||||
const element = panel.getElement()
|
||||
expect(element.style.display).toBe('none')
|
||||
@@ -91,7 +91,7 @@ describe('Panel', () => {
|
||||
})
|
||||
|
||||
describe('when a class name is specified', () => {
|
||||
it('initially renders panel created with visibile: false', () => {
|
||||
it('initially renders panel created with visible: false', () => {
|
||||
const panel = new Panel({className: 'some classes', item: new TestPanelItem()}, atom.views)
|
||||
const element = panel.getElement()
|
||||
|
||||
|
||||
@@ -222,7 +222,7 @@ describe("ReopenProjectMenuManager", () => {
|
||||
expect(label).toBe('https://launch.pad/apollo/11')
|
||||
})
|
||||
|
||||
it("returns a comma-seperated list of base names if there are multiple", () => {
|
||||
it("returns a comma-separated list of base names if there are multiple", () => {
|
||||
const project = { paths: [ '/var/one', '/usr/bin/two', '/etc/mission/control/three' ] }
|
||||
const label = ReopenProjectMenuManager.createLabel(project)
|
||||
expect(label).toBe('one, two, three')
|
||||
|
||||
@@ -1616,7 +1616,7 @@ describe('TextEditorComponent', () => {
|
||||
const decoration = editor.decorateMarker(marker, {type: 'highlight', class: 'a'})
|
||||
decoration.flash('b', 10)
|
||||
|
||||
// Flash on initial appearence of highlight
|
||||
// Flash on initial appearance of highlight
|
||||
await component.getNextUpdatePromise()
|
||||
const highlights = element.querySelectorAll('.highlight.a')
|
||||
expect(highlights.length).toBe(1)
|
||||
|
||||
@@ -620,7 +620,7 @@ describe "TextEditor", ->
|
||||
expect(editor.getCursorBufferPosition()).toEqual [0, 0]
|
||||
|
||||
describe ".moveToBottom()", ->
|
||||
it "moves the cusor to the bottom of the buffer", ->
|
||||
it "moves the cursor to the bottom of the buffer", ->
|
||||
editor.setCursorScreenPosition [0, 0]
|
||||
editor.addCursorAtScreenPosition [1, 0]
|
||||
editor.moveToBottom()
|
||||
@@ -1364,7 +1364,7 @@ describe "TextEditor", ->
|
||||
expect(selections[0].getScreenRange()).toEqual [[3, 0], [10, 0]]
|
||||
|
||||
describe ".selectToBeginningOfPreviousParagraph()", ->
|
||||
it "selects from the cursor to the first line of the pevious paragraph", ->
|
||||
it "selects from the cursor to the first line of the previous paragraph", ->
|
||||
editor.setSelectedBufferRange([[3, 0], [4, 5]])
|
||||
editor.addCursorAtScreenPosition([5, 6])
|
||||
editor.selectToScreenPosition([6, 2])
|
||||
@@ -1397,7 +1397,7 @@ describe "TextEditor", ->
|
||||
expect(selection1.isReversed()).toBeTruthy()
|
||||
|
||||
describe ".selectToTop()", ->
|
||||
it "selects text from cusor position to the top of the buffer", ->
|
||||
it "selects text from cursor position to the top of the buffer", ->
|
||||
editor.setCursorScreenPosition [11, 2]
|
||||
editor.addCursorAtScreenPosition [10, 0]
|
||||
editor.selectToTop()
|
||||
@@ -1407,7 +1407,7 @@ describe "TextEditor", ->
|
||||
expect(editor.getLastSelection().isReversed()).toBeTruthy()
|
||||
|
||||
describe ".selectToBottom()", ->
|
||||
it "selects text from cusor position to the bottom of the buffer", ->
|
||||
it "selects text from cursor position to the bottom of the buffer", ->
|
||||
editor.setCursorScreenPosition [10, 0]
|
||||
editor.addCursorAtScreenPosition [9, 3]
|
||||
editor.selectToBottom()
|
||||
@@ -1422,7 +1422,7 @@ describe "TextEditor", ->
|
||||
expect(editor.getLastSelection().getBufferRange()).toEqual buffer.getRange()
|
||||
|
||||
describe ".selectToBeginningOfLine()", ->
|
||||
it "selects text from cusor position to beginning of line", ->
|
||||
it "selects text from cursor position to beginning of line", ->
|
||||
editor.setCursorScreenPosition [12, 2]
|
||||
editor.addCursorAtScreenPosition [11, 3]
|
||||
|
||||
@@ -1441,7 +1441,7 @@ describe "TextEditor", ->
|
||||
expect(selection2.isReversed()).toBeTruthy()
|
||||
|
||||
describe ".selectToEndOfLine()", ->
|
||||
it "selects text from cusor position to end of line", ->
|
||||
it "selects text from cursor position to end of line", ->
|
||||
editor.setCursorScreenPosition [12, 0]
|
||||
editor.addCursorAtScreenPosition [11, 3]
|
||||
|
||||
@@ -1483,7 +1483,7 @@ describe "TextEditor", ->
|
||||
expect(editor.getSelectedBufferRange()).toEqual [[1, 0], [4, 0]]
|
||||
|
||||
describe ".selectToBeginningOfWord()", ->
|
||||
it "selects text from cusor position to beginning of word", ->
|
||||
it "selects text from cursor position to beginning of word", ->
|
||||
editor.setCursorScreenPosition [0, 13]
|
||||
editor.addCursorAtScreenPosition [3, 49]
|
||||
|
||||
@@ -1502,7 +1502,7 @@ describe "TextEditor", ->
|
||||
expect(selection2.isReversed()).toBeTruthy()
|
||||
|
||||
describe ".selectToEndOfWord()", ->
|
||||
it "selects text from cusor position to end of word", ->
|
||||
it "selects text from cursor position to end of word", ->
|
||||
editor.setCursorScreenPosition [0, 4]
|
||||
editor.addCursorAtScreenPosition [3, 48]
|
||||
|
||||
@@ -1521,7 +1521,7 @@ describe "TextEditor", ->
|
||||
expect(selection2.isReversed()).toBeFalsy()
|
||||
|
||||
describe ".selectToBeginningOfNextWord()", ->
|
||||
it "selects text from cusor position to beginning of next word", ->
|
||||
it "selects text from cursor position to beginning of next word", ->
|
||||
editor.setCursorScreenPosition [0, 4]
|
||||
editor.addCursorAtScreenPosition [3, 48]
|
||||
|
||||
@@ -1800,7 +1800,7 @@ describe "TextEditor", ->
|
||||
editor.setSelectedBufferRanges([[[2, 2], [3, 3]], [[3, 3], [5, 5]]])
|
||||
expect(editor.getSelectedBufferRanges()).toEqual [[[2, 2], [3, 3]], [[3, 3], [5, 5]]]
|
||||
|
||||
it "recyles existing selection instances", ->
|
||||
it "recycles existing selection instances", ->
|
||||
selection = editor.getLastSelection()
|
||||
editor.setSelectedBufferRanges([[[2, 2], [3, 3]], [[4, 4], [5, 5]]])
|
||||
|
||||
@@ -1849,7 +1849,7 @@ describe "TextEditor", ->
|
||||
editor.setSelectedBufferRanges([[[2, 2], [3, 3]], [[3, 0], [5, 5]]])
|
||||
expect(editor.getSelectedBufferRanges()).toEqual [[[2, 2], [5, 5]]]
|
||||
|
||||
it "recyles existing selection instances", ->
|
||||
it "recycles existing selection instances", ->
|
||||
selection = editor.getLastSelection()
|
||||
editor.setSelectedScreenRanges([[[2, 2], [3, 4]], [[4, 4], [5, 5]]])
|
||||
|
||||
@@ -2258,7 +2258,7 @@ describe "TextEditor", ->
|
||||
|
||||
|
||||
describe "when the preceding row consists of folded code", ->
|
||||
it "moves the line above the folded row and preseveres the correct folds", ->
|
||||
it "moves the line above the folded row and perseveres the correct folds", ->
|
||||
expect(editor.lineTextForBufferRow(8)).toBe " return sort(left).concat(pivot).concat(sort(right));"
|
||||
expect(editor.lineTextForBufferRow(9)).toBe " };"
|
||||
|
||||
@@ -3517,7 +3517,7 @@ describe "TextEditor", ->
|
||||
expect(buffer.lineForRow(1)).toBe ' var sort = function(items) { if (items.length <= 1) return items;'
|
||||
|
||||
describe "when text is selected", ->
|
||||
it "still deletes all text to begginning of the line", ->
|
||||
it "still deletes all text to beginning of the line", ->
|
||||
editor.setSelectedBufferRanges([[[1, 24], [1, 27]], [[2, 0], [2, 4]]])
|
||||
editor.deleteToBeginningOfLine()
|
||||
expect(buffer.lineForRow(1)).toBe 'ems) {'
|
||||
@@ -3704,7 +3704,7 @@ describe "TextEditor", ->
|
||||
describe "when autoIndent is enabled", ->
|
||||
describe "when the cursor's column is less than the suggested level of indentation", ->
|
||||
describe "when 'softTabs' is true (the default)", ->
|
||||
it "moves the cursor to the end of the leading whitespace and inserts enough whitespace to bring the line to the suggested level of indentaion", ->
|
||||
it "moves the cursor to the end of the leading whitespace and inserts enough whitespace to bring the line to the suggested level of indentation", ->
|
||||
buffer.insert([5, 0], " \n")
|
||||
editor.setCursorBufferPosition [5, 0]
|
||||
editor.indent(autoIndent: true)
|
||||
@@ -3727,7 +3727,7 @@ describe "TextEditor", ->
|
||||
expect(buffer.lineForRow(13).length).toBe 8
|
||||
|
||||
describe "when 'softTabs' is false", ->
|
||||
it "moves the cursor to the end of the leading whitespace and inserts enough tabs to bring the line to the suggested level of indentaion", ->
|
||||
it "moves the cursor to the end of the leading whitespace and inserts enough tabs to bring the line to the suggested level of indentation", ->
|
||||
convertToHardTabs(buffer)
|
||||
editor.setSoftTabs(false)
|
||||
buffer.insert([5, 0], "\t\n")
|
||||
@@ -4820,7 +4820,7 @@ describe "TextEditor", ->
|
||||
expect(buffer.lineForRow(6)).toBe(line7)
|
||||
expect(buffer.getLineCount()).toBe(count - 1)
|
||||
|
||||
describe "when the line being deleted preceeds a fold, and the command is undone", ->
|
||||
describe "when the line being deleted precedes a fold, and the command is undone", ->
|
||||
it "restores the line and preserves the fold", ->
|
||||
editor.setCursorBufferPosition([4])
|
||||
editor.foldCurrentRow()
|
||||
@@ -4992,7 +4992,7 @@ describe "TextEditor", ->
|
||||
editor.insertText('\n')
|
||||
expect(editor.indentationForBufferRow(2)).toBe editor.indentationForBufferRow(1) + 1
|
||||
|
||||
describe "when the line preceding the newline does't add a level of indentation", ->
|
||||
describe "when the line preceding the newline doesn't add a level of indentation", ->
|
||||
it "indents the new line to the same level as the preceding line", ->
|
||||
editor.setCursorBufferPosition([5, 14])
|
||||
editor.insertText('\n')
|
||||
|
||||
@@ -376,7 +376,7 @@ describe "TokenizedBuffer", ->
|
||||
expect(tokenizedBuffer.bufferRangeForScopeAtPosition('.storage.type.var.js', [0, 3])).toEqual [[0, 0], [0, 3]]
|
||||
|
||||
describe "when the selector matches a run of multiple tokens at the position", ->
|
||||
it "returns the range covered by all contigous tokens (within a single line)", ->
|
||||
it "returns the range covered by all contiguous tokens (within a single line)", ->
|
||||
expect(tokenizedBuffer.bufferRangeForScopeAtPosition('.function', [1, 18])).toEqual [[1, 6], [1, 28]]
|
||||
|
||||
describe ".indentLevelForRow(row)", ->
|
||||
|
||||
@@ -204,7 +204,7 @@ describe "TooltipManager", ->
|
||||
disposable2.dispose()
|
||||
expect(manager.findTooltips(element).length).toBe(0)
|
||||
|
||||
it "lets us hide tooltips programatically", ->
|
||||
it "lets us hide tooltips programmatically", ->
|
||||
disposable = manager.add element, title: "Title"
|
||||
hover element, ->
|
||||
expect(document.body.querySelector(".tooltip")).not.toBeNull()
|
||||
|
||||
@@ -2773,7 +2773,7 @@ i = /test/; #FIXME\
|
||||
})
|
||||
})
|
||||
|
||||
describe('when the core.allowPendingPaneItems option is falsey', () => {
|
||||
describe('when the core.allowPendingPaneItems option is falsy', () => {
|
||||
it('does not open item with `pending: true` option as pending', () => {
|
||||
let pane = null
|
||||
atom.config.set('core.allowPendingPaneItems', false)
|
||||
|
||||
@@ -84,20 +84,20 @@ function compileFileAtPath (compiler, filePath, extension) {
|
||||
var sourceCode = fs.readFileSync(filePath, 'utf8')
|
||||
if (compiler.shouldCompile(sourceCode, filePath)) {
|
||||
var cachePath = compiler.getCachePath(sourceCode, filePath)
|
||||
var compiledCode = readCachedJavascript(cachePath)
|
||||
var compiledCode = readCachedJavaScript(cachePath)
|
||||
if (compiledCode != null) {
|
||||
cacheStats[extension].hits++
|
||||
} else {
|
||||
cacheStats[extension].misses++
|
||||
compiledCode = compiler.compile(sourceCode, filePath)
|
||||
writeCachedJavascript(cachePath, compiledCode)
|
||||
writeCachedJavaScript(cachePath, compiledCode)
|
||||
}
|
||||
return compiledCode
|
||||
}
|
||||
return sourceCode
|
||||
}
|
||||
|
||||
function readCachedJavascript (relativeCachePath) {
|
||||
function readCachedJavaScript (relativeCachePath) {
|
||||
var cachePath = path.join(cacheDirectory, relativeCachePath)
|
||||
if (fs.isFileSync(cachePath)) {
|
||||
try {
|
||||
@@ -107,7 +107,7 @@ function readCachedJavascript (relativeCachePath) {
|
||||
return null
|
||||
}
|
||||
|
||||
function writeCachedJavascript (relativeCachePath, code) {
|
||||
function writeCachedJavaScript (relativeCachePath, code) {
|
||||
var cachePath = path.join(cacheDirectory, relativeCachePath)
|
||||
fs.writeFileSync(cachePath, code, 'utf8')
|
||||
}
|
||||
@@ -153,7 +153,7 @@ exports.install = function (resourcesPath, nodeRequire) {
|
||||
if (!compiler) compiler = COMPILERS['.js']
|
||||
|
||||
try {
|
||||
var fileData = readCachedJavascript(compiler.getCachePath(sourceCode, filePath))
|
||||
var fileData = readCachedJavaScript(compiler.getCachePath(sourceCode, filePath))
|
||||
} catch (error) {
|
||||
console.warn('Error reading compiled file', error.stack)
|
||||
return null
|
||||
|
||||
@@ -221,7 +221,7 @@ ScopeDescriptor = require './scope-descriptor'
|
||||
# #### object / Grouping other types
|
||||
#
|
||||
# A config setting with the type `object` allows grouping a set of config
|
||||
# settings. The group will be visualy separated and has its own group headline.
|
||||
# settings. The group will be visually separated and has its own group headline.
|
||||
# The sub options must be listed under a `properties` key.
|
||||
#
|
||||
# ```coffee
|
||||
|
||||
@@ -13,7 +13,7 @@ class DefaultDirectoryProvider
|
||||
#
|
||||
# Returns:
|
||||
# * {Directory} if the given URI is compatible with this provider.
|
||||
# * `null` if the given URI is not compatibile with this provider.
|
||||
# * `null` if the given URI is not compatible with this provider.
|
||||
directoryForURISync: (uri) ->
|
||||
normalizedPath = @normalizePath(uri)
|
||||
{host} = url.parse(uri)
|
||||
@@ -39,7 +39,7 @@ class DefaultDirectoryProvider
|
||||
#
|
||||
# Returns a {Promise} that resolves to:
|
||||
# * {Directory} if the given URI is compatible with this provider.
|
||||
# * `null` if the given URI is not compatibile with this provider.
|
||||
# * `null` if the given URI is not compatible with this provider.
|
||||
directoryForURI: (uri) ->
|
||||
Promise.resolve(@directoryForURISync(uri))
|
||||
|
||||
|
||||
@@ -119,7 +119,7 @@ module.exports = class Dock {
|
||||
this.setState({visible: false})
|
||||
}
|
||||
|
||||
// Extended: Toggle the dock's visiblity without changing the {Workspace}'s
|
||||
// Extended: Toggle the dock's visibility without changing the {Workspace}'s
|
||||
// active pane container.
|
||||
toggle () {
|
||||
const state = {visible: !this.state.visible}
|
||||
@@ -143,7 +143,7 @@ module.exports = class Dock {
|
||||
// frame to ensure the property is animated (or not) appropriately, however we luck out in this
|
||||
// case because the drag start always happens before the item is dragged into the toggle button.
|
||||
if (nextState.visible !== prevState.visible) {
|
||||
// Never animate toggling visiblity...
|
||||
// Never animate toggling visibility...
|
||||
nextState.shouldAnimate = false
|
||||
} else if (!nextState.visible && nextState.draggingItem && !prevState.draggingItem) {
|
||||
// ...but do animate if you start dragging while the panel is hidden.
|
||||
|
||||
@@ -239,7 +239,7 @@ class RegistryWatcherNode {
|
||||
this.childPaths.add(path.join(...childPathSegments))
|
||||
}
|
||||
|
||||
// Private: Stop assuming responsbility for a previously assigned child path. If this node is
|
||||
// Private: Stop assuming responsibility for a previously assigned child path. If this node is
|
||||
// removed, the named child path will no longer be allocated a {RegistryWatcherNode}.
|
||||
//
|
||||
// * `childPathSegments` the {Array} of path segments between this node's directory and the no longer
|
||||
@@ -323,13 +323,13 @@ class RegistryWatcherNode {
|
||||
}
|
||||
}
|
||||
|
||||
// Private: A {RegisteryNode} traversal result that's returned when neither a directory, its children, nor its parents
|
||||
// Private: A {RegistryNode} traversal result that's returned when neither a directory, its children, nor its parents
|
||||
// are present in the tree.
|
||||
class MissingResult {
|
||||
|
||||
// Private: Instantiate a new {MissingResult}.
|
||||
//
|
||||
// * `lastParent` the final succesfully traversed {RegistryNode}.
|
||||
// * `lastParent` the final successfully traversed {RegistryNode}.
|
||||
constructor (lastParent) {
|
||||
this.lastParent = lastParent
|
||||
}
|
||||
|
||||
@@ -437,7 +437,7 @@ class PathWatcher {
|
||||
// await watcher.getStartPromise()
|
||||
// fs.writeFile(FILE, 'contents\n', err => {
|
||||
// // The watcher is listening and the event should be
|
||||
// // received asyncronously
|
||||
// // received asynchronously
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
|
||||
@@ -117,7 +117,7 @@ class TextEditorComponent {
|
||||
this.linesToMeasure = new Map()
|
||||
this.extraRenderedScreenLines = new Map()
|
||||
this.horizontalPositionsToMeasure = new Map() // Keys are rows with positions we want to measure, values are arrays of columns to measure
|
||||
this.horizontalPixelPositionsByScreenLineId = new Map() // Values are maps from column to horiontal pixel positions
|
||||
this.horizontalPixelPositionsByScreenLineId = new Map() // Values are maps from column to horizontal pixel positions
|
||||
this.blockDecorationsToMeasure = new Set()
|
||||
this.blockDecorationsByElement = new WeakMap()
|
||||
this.blockDecorationSentinel = document.createElement('div')
|
||||
@@ -2750,7 +2750,7 @@ class TextEditorComponent {
|
||||
// but keeping this calculation simple ensures the number of tiles remains
|
||||
// fixed for a given editor height, which eliminates situations where a
|
||||
// tile is repeatedly added and removed during scrolling in certain
|
||||
// comibinations of editor height and line height.
|
||||
// combinations of editor height and line height.
|
||||
getVisibleTileCount () {
|
||||
if (this.derivedDimensionsCache.visibleTileCount == null) {
|
||||
const editorHeightInTiles = this.getScrollContainerHeight() / this.getLineHeight() / this.getRowsPerTile()
|
||||
|
||||
@@ -1223,7 +1223,7 @@ class TextEditor extends Model
|
||||
@autoIndentSelectedRows() if @shouldAutoIndent()
|
||||
@scrollToBufferPosition([newSelectionRanges[0].start.row, 0])
|
||||
|
||||
# Move lines intersecting the most recent selection or muiltiple selections
|
||||
# Move lines intersecting the most recent selection or multiple selections
|
||||
# down by one row in screen coordinates.
|
||||
moveLineDown: ->
|
||||
selections = @getSelectedBufferRanges()
|
||||
@@ -2510,7 +2510,7 @@ class TextEditor extends Model
|
||||
# Essential: Select from the current cursor position to the given position in
|
||||
# buffer coordinates.
|
||||
#
|
||||
# This method may merge selections that end up intesecting.
|
||||
# This method may merge selections that end up intersecting.
|
||||
#
|
||||
# * `position` An instance of {Point}, with a given `row` and `column`.
|
||||
selectToBufferPosition: (position) ->
|
||||
@@ -2521,7 +2521,7 @@ class TextEditor extends Model
|
||||
# Essential: Select from the current cursor position to the given position in
|
||||
# screen coordinates.
|
||||
#
|
||||
# This method may merge selections that end up intesecting.
|
||||
# This method may merge selections that end up intersecting.
|
||||
#
|
||||
# * `position` An instance of {Point}, with a given `row` and `column`.
|
||||
selectToScreenPosition: (position, options) ->
|
||||
@@ -2535,7 +2535,7 @@ class TextEditor extends Model
|
||||
#
|
||||
# * `rowCount` (optional) {Number} number of rows to select (default: 1)
|
||||
#
|
||||
# This method may merge selections that end up intesecting.
|
||||
# This method may merge selections that end up intersecting.
|
||||
selectUp: (rowCount) ->
|
||||
@expandSelectionsBackward (selection) -> selection.selectUp(rowCount)
|
||||
|
||||
@@ -2544,7 +2544,7 @@ class TextEditor extends Model
|
||||
#
|
||||
# * `rowCount` (optional) {Number} number of rows to select (default: 1)
|
||||
#
|
||||
# This method may merge selections that end up intesecting.
|
||||
# This method may merge selections that end up intersecting.
|
||||
selectDown: (rowCount) ->
|
||||
@expandSelectionsForward (selection) -> selection.selectDown(rowCount)
|
||||
|
||||
@@ -2553,7 +2553,7 @@ class TextEditor extends Model
|
||||
#
|
||||
# * `columnCount` (optional) {Number} number of columns to select (default: 1)
|
||||
#
|
||||
# This method may merge selections that end up intesecting.
|
||||
# This method may merge selections that end up intersecting.
|
||||
selectLeft: (columnCount) ->
|
||||
@expandSelectionsBackward (selection) -> selection.selectLeft(columnCount)
|
||||
|
||||
@@ -2562,7 +2562,7 @@ class TextEditor extends Model
|
||||
#
|
||||
# * `columnCount` (optional) {Number} number of columns to select (default: 1)
|
||||
#
|
||||
# This method may merge selections that end up intesecting.
|
||||
# This method may merge selections that end up intersecting.
|
||||
selectRight: (columnCount) ->
|
||||
@expandSelectionsForward (selection) -> selection.selectRight(columnCount)
|
||||
|
||||
@@ -2589,7 +2589,7 @@ class TextEditor extends Model
|
||||
# Essential: Move the cursor of each selection to the beginning of its line
|
||||
# while preserving the selection's tail position.
|
||||
#
|
||||
# This method may merge selections that end up intesecting.
|
||||
# This method may merge selections that end up intersecting.
|
||||
selectToBeginningOfLine: ->
|
||||
@expandSelectionsBackward (selection) -> selection.selectToBeginningOfLine()
|
||||
|
||||
|
||||
@@ -127,7 +127,7 @@ class ThemeManager
|
||||
|
||||
# Resolve and apply the stylesheet specified by the path.
|
||||
#
|
||||
# This supports both CSS and Less stylsheets.
|
||||
# This supports both CSS and Less stylesheets.
|
||||
#
|
||||
# * `stylesheetPath` A {String} path to the stylesheet that can be an absolute
|
||||
# path or a relative path that will be resolved against the load path.
|
||||
@@ -142,8 +142,8 @@ class ThemeManager
|
||||
throw new Error("Could not find a file at path '#{stylesheetPath}'")
|
||||
|
||||
unwatchUserStylesheet: ->
|
||||
@userStylsheetSubscriptions?.dispose()
|
||||
@userStylsheetSubscriptions = null
|
||||
@userStylesheetSubscriptions?.dispose()
|
||||
@userStylesheetSubscriptions = null
|
||||
@userStylesheetFile = null
|
||||
@userStyleSheetDisposable?.dispose()
|
||||
@userStyleSheetDisposable = null
|
||||
@@ -156,11 +156,11 @@ class ThemeManager
|
||||
|
||||
try
|
||||
@userStylesheetFile = new File(userStylesheetPath)
|
||||
@userStylsheetSubscriptions = new CompositeDisposable()
|
||||
@userStylesheetSubscriptions = new CompositeDisposable()
|
||||
reloadStylesheet = => @loadUserStylesheet()
|
||||
@userStylsheetSubscriptions.add(@userStylesheetFile.onDidChange(reloadStylesheet))
|
||||
@userStylsheetSubscriptions.add(@userStylesheetFile.onDidRename(reloadStylesheet))
|
||||
@userStylsheetSubscriptions.add(@userStylesheetFile.onDidDelete(reloadStylesheet))
|
||||
@userStylesheetSubscriptions.add(@userStylesheetFile.onDidChange(reloadStylesheet))
|
||||
@userStylesheetSubscriptions.add(@userStylesheetFile.onDidRename(reloadStylesheet))
|
||||
@userStylesheetSubscriptions.add(@userStylesheetFile.onDidDelete(reloadStylesheet))
|
||||
catch error
|
||||
message = """
|
||||
Unable to watch path: `#{path.basename(userStylesheetPath)}`. Make sure
|
||||
|
||||
@@ -65,7 +65,7 @@ class TooltipManager
|
||||
# * `title` A {String} or {Function} to use for the text in the tip. If
|
||||
# a function is passed, `this` will be set to the `target` element. This
|
||||
# option is mutually exclusive with the `item` option.
|
||||
# * `html` A {Boolean} affecting the interpetation of the `title` option.
|
||||
# * `html` A {Boolean} affecting the interpretation of the `title` option.
|
||||
# If `true` (the default), the `title` string will be interpreted as HTML.
|
||||
# Otherwise it will be interpreted as plain text.
|
||||
# * `item` A view (object with an `.element` property) or a DOM element
|
||||
|
||||
@@ -78,10 +78,10 @@ class WorkspaceElement extends HTMLElement {
|
||||
this.project = project
|
||||
this.config = config
|
||||
this.styleManager = styleManager
|
||||
if (this.viewRegistry == null) { throw new Error('Must pass a viewRegistry parameter when initializing WorskpaceElements') }
|
||||
if (this.project == null) { throw new Error('Must pass a project parameter when initializing WorskpaceElements') }
|
||||
if (this.config == null) { throw new Error('Must pass a config parameter when initializing WorskpaceElements') }
|
||||
if (this.styleManager == null) { throw new Error('Must pass a styleManager parameter when initializing WorskpaceElements') }
|
||||
if (this.viewRegistry == null) { throw new Error('Must pass a viewRegistry parameter when initializing WorkspaceElements') }
|
||||
if (this.project == null) { throw new Error('Must pass a project parameter when initializing WorkspaceElements') }
|
||||
if (this.config == null) { throw new Error('Must pass a config parameter when initializing WorkspaceElements') }
|
||||
if (this.styleManager == null) { throw new Error('Must pass a styleManager parameter when initializing WorkspaceElements') }
|
||||
|
||||
this.subscriptions = new CompositeDisposable(
|
||||
new Disposable(() => {
|
||||
|
||||
Reference in New Issue
Block a user