From 59f6065e9b181102bee496cef4f48fbe93b0242c Mon Sep 17 00:00:00 2001 From: Steven Hobson-Campbell Date: Tue, 22 Aug 2017 19:05:12 -0700 Subject: [PATCH 01/18] Adding option to skip main process tests. Cleaning up resources in tests. --- script/package.json | 1 + script/test | 18 ++++++++++++++---- spec/git-repository-provider-spec.coffee | 3 +++ spec/project-spec.coffee | 4 ++++ src/atom-environment.coffee | 1 - 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/script/package.json b/script/package.json index 454d561aa..82500d12c 100644 --- a/script/package.json +++ b/script/package.json @@ -20,6 +20,7 @@ "legal-eagle": "0.14.0", "lodash.template": "4.4.0", "minidump": "0.9.0", + "minimist": "^1.2.0", "mkdirp": "0.5.1", "normalize-package-data": "2.3.5", "npm": "5.3.0", diff --git a/script/test b/script/test index 2f22b1e0a..1b1453341 100755 --- a/script/test +++ b/script/test @@ -3,6 +3,7 @@ 'use strict' require('colors') +const argv = require('minimist')(process.argv.slice(2)) const assert = require('assert') const async = require('async') const childProcess = require('child_process') @@ -150,17 +151,26 @@ function runBenchmarkTests (callback) { let testSuitesToRun = testSuitesForPlatform(process.platform) function testSuitesForPlatform (platform) { + let suites = []; switch (platform) { case 'darwin': - return [runCoreMainProcessTests, runCoreRenderProcessTests, runBenchmarkTests].concat(packageTestSuites) + suites = [runCoreMainProcessTests, runCoreRenderProcessTests, runBenchmarkTests].concat(packageTestSuites) + break case 'win32': - return (process.arch === 'x64') ? [runCoreMainProcessTests, runCoreRenderProcessTests] : [runCoreMainProcessTests] + suites = (process.arch === 'x64') ? [runCoreMainProcessTests, runCoreRenderProcessTests] : [runCoreMainProcessTests] + break case 'linux': - return [runCoreMainProcessTests] + suites = [runCoreMainProcessTests] + break default: console.log(`Unrecognized platform: ${platform}`) - return [] } + + if(argv.skipMainProccessTests) { + suites = suites.filter(suite => suite !== runCoreMainProcessTests); + } + + return suites; } async.series(testSuitesToRun, function (err, exitCodes) { diff --git a/spec/git-repository-provider-spec.coffee b/spec/git-repository-provider-spec.coffee index 16ccf8938..186bc7f63 100644 --- a/spec/git-repository-provider-spec.coffee +++ b/spec/git-repository-provider-spec.coffee @@ -12,6 +12,9 @@ describe "GitRepositoryProvider", -> provider = new GitRepositoryProvider(atom.project, atom.config, atom.confirm) afterEach -> + if provider? + provider.pathToRepository[key].destroy() for key in Object.keys(provider.pathToRepository) + try temp.cleanupSync() diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee index 4ce84617a..6ce13c3f4 100644 --- a/spec/project-spec.coffee +++ b/spec/project-spec.coffee @@ -94,6 +94,8 @@ describe "Project", -> waitsForPromise -> atom.workspace.open('a') + notQuittingProject = null + quittingProject = null bufferA = null layerA = null markerA = null @@ -105,12 +107,14 @@ describe "Project", -> bufferA.append('!') waitsForPromise -> + notQuittingProject?.destroy() notQuittingProject = new Project({notificationManager: atom.notifications, packageManager: atom.packages, confirm: atom.confirm}) notQuittingProject.deserialize(atom.project.serialize({isUnloading: false})).then -> expect(notQuittingProject.getBuffers()[0].getMarkerLayer(layerA.id)?.getMarker(markerA.id)).toBeUndefined() expect(notQuittingProject.getBuffers()[0].undo()).toBe(false) waitsForPromise -> + quittingProject?.destroy() quittingProject = new Project({notificationManager: atom.notifications, packageManager: atom.packages, confirm: atom.confirm}) quittingProject.deserialize(atom.project.serialize({isUnloading: true})).then -> expect(quittingProject.getBuffers()[0].getMarkerLayer(layerA.id)?.getMarker(markerA.id)).not.toBeUndefined() diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee index b37acddd1..d777ecc3e 100644 --- a/src/atom-environment.coffee +++ b/src/atom-environment.coffee @@ -40,7 +40,6 @@ PaneContainer = require './pane-container' PaneAxis = require './pane-axis' Pane = require './pane' Dock = require './dock' -Project = require './project' TextEditor = require './text-editor' TextBuffer = require 'text-buffer' Gutter = require './gutter' From f00bc1e1adf4d9f776c2cbc309306bb3df0a000d Mon Sep 17 00:00:00 2001 From: Steven Hobson-Campbell Date: Tue, 5 Sep 2017 17:58:36 -0700 Subject: [PATCH 02/18] Switching from minimist -> yargs --- script/package.json | 1 - script/test | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/script/package.json b/script/package.json index 82500d12c..454d561aa 100644 --- a/script/package.json +++ b/script/package.json @@ -20,7 +20,6 @@ "legal-eagle": "0.14.0", "lodash.template": "4.4.0", "minidump": "0.9.0", - "minimist": "^1.2.0", "mkdirp": "0.5.1", "normalize-package-data": "2.3.5", "npm": "5.3.0", diff --git a/script/test b/script/test index 1b1453341..c4df0efad 100755 --- a/script/test +++ b/script/test @@ -3,7 +3,7 @@ 'use strict' require('colors') -const argv = require('minimist')(process.argv.slice(2)) +const argv = require('yargs').argv const assert = require('assert') const async = require('async') const childProcess = require('child_process') @@ -166,7 +166,7 @@ function testSuitesForPlatform (platform) { console.log(`Unrecognized platform: ${platform}`) } - if(argv.skipMainProccessTests) { + if(argv.skipMainProcessTests) { suites = suites.filter(suite => suite !== runCoreMainProcessTests); } From 80c81b9e03291c0872766d3b1c5a3e3e3dce636e Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 8 Sep 2017 15:56:48 -0700 Subject: [PATCH 03/18] PR feedback --- script/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test b/script/test index c4df0efad..c6c3a6a61 100755 --- a/script/test +++ b/script/test @@ -166,7 +166,7 @@ function testSuitesForPlatform (platform) { console.log(`Unrecognized platform: ${platform}`) } - if(argv.skipMainProcessTests) { + if (argv.skipMainProcessTests) { suites = suites.filter(suite => suite !== runCoreMainProcessTests); } From ad1328db5aaef81da53cb1d1ab1f4dd6cbe91ceb Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 14 Nov 2017 12:17:50 -0700 Subject: [PATCH 04/18] Revert "Merge pull request #16092 from atom/autoscroll-after-fold-or-unfold" This reverts commit 6227ecebedf676613d6a698a12d7eaaa8c791ff8, reversing changes made to 311055c57510197ee8bc6d24a9c1d3aa7d295beb. --- spec/text-editor-spec.js | 26 +++----------------------- src/text-editor.js | 28 ++++++---------------------- 2 files changed, 9 insertions(+), 45 deletions(-) diff --git a/spec/text-editor-spec.js b/spec/text-editor-spec.js index fa8406731..198cf1c43 100644 --- a/spec/text-editor-spec.js +++ b/spec/text-editor-spec.js @@ -115,12 +115,12 @@ describe('TextEditor', () => { editor.update({showCursorOnSelection: false}) editor.setSelectedBufferRange([[1, 2], [3, 4]]) editor.addSelectionForBufferRange([[5, 6], [7, 8]], {reversed: true}) - editor.foldBufferRow(4) - expect(editor.isFoldedAtBufferRow(4)).toBeTruthy() editor.setScrollTopRow(3) expect(editor.getScrollTopRow()).toBe(3) editor.setScrollLeftColumn(4) expect(editor.getScrollLeftColumn()).toBe(4) + editor.foldBufferRow(4) + expect(editor.isFoldedAtBufferRow(4)).toBeTruthy() const editor2 = editor.copy() const element2 = editor2.getElement() @@ -7028,19 +7028,15 @@ describe('TextEditor', () => { }) describe('.unfoldAll()', () => { - it('unfolds every folded line and autoscrolls', async () => { + it('unfolds every folded line', async () => { editor = await atom.workspace.open('sample.js', {autoIndent: false}) - const autoscrollEvents = [] - editor.onDidRequestAutoscroll(event => autoscrollEvents.push(event)) const initialScreenLineCount = editor.getScreenLineCount() editor.foldBufferRow(0) editor.foldBufferRow(1) expect(editor.getScreenLineCount()).toBeLessThan(initialScreenLineCount) - expect(autoscrollEvents.length).toBe(1) editor.unfoldAll() expect(editor.getScreenLineCount()).toBe(initialScreenLineCount) - expect(autoscrollEvents.length).toBe(2) }) it('unfolds every folded line with comments', async () => { @@ -7058,11 +7054,8 @@ describe('TextEditor', () => { describe('.foldAll()', () => { it('folds every foldable line', async () => { editor = await atom.workspace.open('sample.js', {autoIndent: false}) - const autoscrollEvents = [] - editor.onDidRequestAutoscroll(event => autoscrollEvents.push(event)) editor.foldAll() - expect(autoscrollEvents.length).toBe(1) const [fold1, fold2, fold3] = editor.unfoldAll() expect([fold1.start.row, fold1.end.row]).toEqual([0, 12]) expect([fold2.start.row, fold2.end.row]).toEqual([1, 9]) @@ -7093,11 +7086,7 @@ describe('TextEditor', () => { describe('when bufferRow can be folded', () => { it('creates a fold based on the syntactic region starting at the given row', () => { - const autoscrollEvents = [] - editor.onDidRequestAutoscroll(event => autoscrollEvents.push(event)) - editor.foldBufferRow(1) - expect(autoscrollEvents.length).toBe(1) const [fold] = editor.unfoldAll() expect([fold.start.row, fold.end.row]).toEqual([1, 9]) }) @@ -7144,14 +7133,10 @@ describe('TextEditor', () => { describe('.foldCurrentRow()', () => { it('creates a fold at the location of the last cursor', async () => { editor = await atom.workspace.open() - editor.setText('\nif (x) {\n y()\n}') editor.setCursorBufferPosition([1, 0]) expect(editor.getScreenLineCount()).toBe(4) - const autoscrollEvents = [] - editor.onDidRequestAutoscroll(event => autoscrollEvents.push(event)) editor.foldCurrentRow() - expect(autoscrollEvents.length).toBe(1) expect(editor.getScreenLineCount()).toBe(3) }) @@ -7168,26 +7153,21 @@ describe('TextEditor', () => { describe('.foldAllAtIndentLevel(indentLevel)', () => { it('folds blocks of text at the given indentation level', async () => { editor = await atom.workspace.open('sample.js', {autoIndent: false}) - const autoscrollEvents = [] - editor.onDidRequestAutoscroll(event => autoscrollEvents.push(event)) editor.foldAllAtIndentLevel(0) expect(editor.lineTextForScreenRow(0)).toBe(`var quicksort = function () {${editor.displayLayer.foldCharacter}`) expect(editor.getLastScreenRow()).toBe(0) - expect(autoscrollEvents.length).toBe(1) editor.foldAllAtIndentLevel(1) expect(editor.lineTextForScreenRow(0)).toBe('var quicksort = function () {') expect(editor.lineTextForScreenRow(1)).toBe(` var sort = function(items) {${editor.displayLayer.foldCharacter}`) expect(editor.getLastScreenRow()).toBe(4) - expect(autoscrollEvents.length).toBe(2) editor.foldAllAtIndentLevel(2) expect(editor.lineTextForScreenRow(0)).toBe('var quicksort = function () {') expect(editor.lineTextForScreenRow(1)).toBe(' var sort = function(items) {') expect(editor.lineTextForScreenRow(2)).toBe(' if (items.length <= 1) return items;') expect(editor.getLastScreenRow()).toBe(9) - expect(autoscrollEvents.length).toBe(3) }) it('folds every foldable range at a given indentLevel', async () => { diff --git a/src/text-editor.js b/src/text-editor.js index 8eee5c140..a0b9d19a0 100644 --- a/src/text-editor.js +++ b/src/text-editor.js @@ -3750,19 +3750,13 @@ class TextEditor { foldCurrentRow () { const {row} = this.getCursorBufferPosition() const range = this.tokenizedBuffer.getFoldableRangeContainingPoint(Point(row, Infinity)) - if (range) { - const result = this.displayLayer.foldBufferRange(range) - this.scrollToCursorPosition() - return result - } + if (range) return this.displayLayer.foldBufferRange(range) } // Essential: Unfold the most recent cursor's row by one level. unfoldCurrentRow () { const {row} = this.getCursorBufferPosition() - const result = this.displayLayer.destroyFoldsContainingBufferPositions([Point(row, Infinity)], false) - this.scrollToCursorPosition() - return result + return this.displayLayer.destroyFoldsContainingBufferPositions([Point(row, Infinity)], false) } // Essential: Fold the given row in buffer coordinates based on its indentation @@ -3780,7 +3774,6 @@ class TextEditor { const existingFolds = this.displayLayer.foldsIntersectingBufferRange(Range(foldableRange.start, foldableRange.start)) if (existingFolds.length === 0) { this.displayLayer.foldBufferRange(foldableRange) - this.scrollToCursorPosition() } else { const firstExistingFoldRange = this.displayLayer.bufferRangeForFold(existingFolds[0]) if (firstExistingFoldRange.start.isLessThan(position)) { @@ -3798,9 +3791,7 @@ class TextEditor { // * `bufferRow` A {Number} unfoldBufferRow (bufferRow) { const position = Point(bufferRow, Infinity) - const result = this.displayLayer.destroyFoldsContainingBufferPositions([position]) - this.scrollToCursorPosition() - return result + return this.displayLayer.destroyFoldsContainingBufferPositions([position]) } // Extended: For each selection, fold the rows it intersects. @@ -3816,7 +3807,6 @@ class TextEditor { for (let range of this.tokenizedBuffer.getFoldableRanges(this.getTabLength())) { this.displayLayer.foldBufferRange(range) } - this.scrollToCursorPosition() } // Extended: Unfold all existing folds. @@ -3834,7 +3824,6 @@ class TextEditor { for (let range of this.tokenizedBuffer.getFoldableRangesAtIndentLevel(level, this.getTabLength())) { this.displayLayer.foldBufferRange(range) } - this.scrollToCursorPosition() } // Extended: Determine whether the given row in buffer coordinates is foldable. @@ -3862,14 +3851,11 @@ class TextEditor { // Extended: Fold the given buffer row if it isn't currently folded, and unfold // it otherwise. toggleFoldAtBufferRow (bufferRow) { - let result if (this.isFoldedAtBufferRow(bufferRow)) { - result = this.unfoldBufferRow(bufferRow) + return this.unfoldBufferRow(bufferRow) } else { - result = this.foldBufferRow(bufferRow) + return this.foldBufferRow(bufferRow) } - this.scrollToCursorPosition() - return result } // Extended: Determine whether the most recently added cursor's row is folded. @@ -3908,9 +3894,7 @@ class TextEditor { // // Returns the new {Fold}. foldBufferRowRange (startRow, endRow) { - const result = this.foldBufferRange(Range(Point(startRow, Infinity), Point(endRow, Infinity))) - this.scrollToCursorPosition() - return result + return this.foldBufferRange(Range(Point(startRow, Infinity), Point(endRow, Infinity))) } foldBufferRange (range) { From 000d0d1a5ec0bd51d35aa81d47365a22536c30c4 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 14 Nov 2017 12:29:32 -0700 Subject: [PATCH 05/18] Auto-scroll after folding/unfolding via a command In my previous attempt in #16092, I was autoscrolling in the TextEditor methods themselves. But this could lead to undesirable autoscrolling when folding with the mouse. --- src/register-default-commands.coffee | 44 +++++++++++++++++++++------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/src/register-default-commands.coffee b/src/register-default-commands.coffee index 7dc0d3298..0bacfbb8e 100644 --- a/src/register-default-commands.coffee +++ b/src/register-default-commands.coffee @@ -219,18 +219,40 @@ module.exports = ({commandRegistry, commandInstaller, config, notificationManage 'editor:toggle-soft-wrap': -> @toggleSoftWrapped() 'editor:fold-all': -> @foldAll() 'editor:unfold-all': -> @unfoldAll() - 'editor:fold-current-row': -> @foldCurrentRow() - 'editor:unfold-current-row': -> @unfoldCurrentRow() + 'editor:fold-current-row': -> + @foldCurrentRow() + @scrollToCursorPosition() + 'editor:unfold-current-row': -> + @unfoldCurrentRow() + @scrollToCursorPosition() 'editor:fold-selection': -> @foldSelectedLines() - 'editor:fold-at-indent-level-1': -> @foldAllAtIndentLevel(0) - 'editor:fold-at-indent-level-2': -> @foldAllAtIndentLevel(1) - 'editor:fold-at-indent-level-3': -> @foldAllAtIndentLevel(2) - 'editor:fold-at-indent-level-4': -> @foldAllAtIndentLevel(3) - 'editor:fold-at-indent-level-5': -> @foldAllAtIndentLevel(4) - 'editor:fold-at-indent-level-6': -> @foldAllAtIndentLevel(5) - 'editor:fold-at-indent-level-7': -> @foldAllAtIndentLevel(6) - 'editor:fold-at-indent-level-8': -> @foldAllAtIndentLevel(7) - 'editor:fold-at-indent-level-9': -> @foldAllAtIndentLevel(8) + 'editor:fold-at-indent-level-1': -> + @foldAllAtIndentLevel(0) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-2': -> + @foldAllAtIndentLevel(1) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-3': -> + @foldAllAtIndentLevel(2) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-4': -> + @foldAllAtIndentLevel(3) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-5': -> + @foldAllAtIndentLevel(4) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-6': -> + @foldAllAtIndentLevel(5) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-7': -> + @foldAllAtIndentLevel(6) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-8': -> + @foldAllAtIndentLevel(7) + @scrollToCursorPosition() + 'editor:fold-at-indent-level-9': -> + @foldAllAtIndentLevel(8) + @scrollToCursorPosition() 'editor:log-cursor-scope': -> showCursorScope(@getCursorScope(), notificationManager) 'editor:copy-path': -> copyPathToClipboard(this, project, clipboard, false) 'editor:copy-project-path': -> copyPathToClipboard(this, project, clipboard, true) From b18ba63f5482814d97ef1b5e4064762f9d02d2c8 Mon Sep 17 00:00:00 2001 From: U8N WXD Date: Wed, 15 Nov 2017 11:31:46 -0800 Subject: [PATCH 06/18] Change HTTP Links to HTTPS in linux.md Similar to issue #16167 and PR #16173 Change links throughout docs/build-instructions/linux.md to support SSL/TLS by changing URL to `https://` [ci skip] Signed-off-by: U8N WXD --- docs/build-instructions/linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md index 3499f6ac9..12e9f68ef 100644 --- a/docs/build-instructions/linux.md +++ b/docs/build-instructions/linux.md @@ -1 +1 @@ -See the [Hacking on Atom Core](http://flight-manual.atom.io/hacking-atom/sections/hacking-on-atom-core/#platform-linux) section in the [Atom Flight Manual](http://flight-manual.atom.io). +See the [Hacking on Atom Core](https://flight-manual.atom.io/hacking-atom/sections/hacking-on-atom-core/#platform-linux) section in the [Atom Flight Manual](https://flight-manual.atom.io). From cda38cd8cc1bb72e4f34a9ff5b0e912e7a693d56 Mon Sep 17 00:00:00 2001 From: U8N WXD Date: Wed, 15 Nov 2017 11:47:53 -0800 Subject: [PATCH 07/18] Change HTTP Links to HTTPS in macOS.md Similar to issue #16167 and PR #16173 Change links throughout docs/build-instructions/macOS.md to support SSL/TLS by changing URL to `https://` [ci skip] Signed-off-by: U8N WXD --- docs/build-instructions/macOS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-instructions/macOS.md b/docs/build-instructions/macOS.md index 3085d11f3..8a0f7b1dd 100644 --- a/docs/build-instructions/macOS.md +++ b/docs/build-instructions/macOS.md @@ -1 +1 @@ -See the [Hacking on Atom Core](http://flight-manual.atom.io/hacking-atom/sections/hacking-on-atom-core/#platform-mac) section in the [Atom Flight Manual](http://flight-manual.atom.io). +See the [Hacking on Atom Core](https://flight-manual.atom.io/hacking-atom/sections/hacking-on-atom-core/#platform-mac) section in the [Atom Flight Manual](https://flight-manual.atom.io). From 98121f325ef03857fa24d9c9a315dd903dab63a3 Mon Sep 17 00:00:00 2001 From: U8N WXD Date: Wed, 15 Nov 2017 11:54:37 -0800 Subject: [PATCH 08/18] Change HTTP Links to HTTPS in windows.md Similar to issue #16167 and PR #16173 Change links throughout docs/build-instructions/windows.md to support SSL/TLS by changing URL to `https://` [ci skip] Signed-off-by: U8N WXD --- docs/build-instructions/windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-instructions/windows.md b/docs/build-instructions/windows.md index f75a07530..49b5fa74c 100644 --- a/docs/build-instructions/windows.md +++ b/docs/build-instructions/windows.md @@ -1 +1 @@ -See the [Hacking on Atom Core](http://flight-manual.atom.io/hacking-atom/sections/hacking-on-atom-core/#platform-windows) section in the [Atom Flight Manual](http://flight-manual.atom.io). +See the [Hacking on Atom Core](https://flight-manual.atom.io/hacking-atom/sections/hacking-on-atom-core/#platform-windows) section in the [Atom Flight Manual](https://flight-manual.atom.io). From 57a00c4ec0f1a895830cc9e19bf049801e206b79 Mon Sep 17 00:00:00 2001 From: U8N WXD Date: Wed, 15 Nov 2017 23:24:02 +0000 Subject: [PATCH 09/18] Change HTTP Links to HTTPS in contributing-to-packages.md Similar to issue #16167 and PR #16173 Change links throughout docs/contributing-to-packages.md to support SSL/TLS by changing URL to `https://` [ci skip] Signed-off-by: U8N WXD --- docs/contributing-to-packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contributing-to-packages.md b/docs/contributing-to-packages.md index 67933dc26..a91e3575e 100644 --- a/docs/contributing-to-packages.md +++ b/docs/contributing-to-packages.md @@ -1 +1 @@ -See http://flight-manual.atom.io/hacking-atom/sections/contributing-to-official-atom-packages/ +See https://flight-manual.atom.io/hacking-atom/sections/contributing-to-official-atom-packages/ From 377eeeae66f63b6377f286a347e1153e4dd653d9 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 15 Nov 2017 18:43:30 -0800 Subject: [PATCH 10/18] :arrow_up: command-palette --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8fdef88d1..9a970aa4e 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "background-tips": "0.27.1", "bookmarks": "0.44.4", "bracket-matcher": "0.88.0", - "command-palette": "0.42.0", + "command-palette": "0.42.1", "dalek": "0.2.1", "deprecation-cop": "0.56.9", "dev-live-reload": "0.48.1", From 6cbc9988ecf935ab3905700a68bf3ce4f854cb3b Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 15 Nov 2017 19:35:30 -0800 Subject: [PATCH 11/18] Revert ":arrow_up: tree-view@0.222.0" This reverts commit ea0a673b957a94fa8540564fb305e6315ad4b448. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a970aa4e..94bcf04ee 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "symbols-view": "0.118.1", "tabs": "0.109.1", "timecop": "0.36.2", - "tree-view": "0.222.0", + "tree-view": "0.221.3", "update-package-dependencies": "0.13.0", "welcome": "0.36.5", "whitespace": "0.37.5", From 5db1b0828223c76e7191ed1b4dfe5a481908f679 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Thu, 16 Nov 2017 20:26:52 +0100 Subject: [PATCH 12/18] :arrow_up: package-generator@1.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94bcf04ee..5287907c7 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "metrics": "1.2.6", "notifications": "0.69.2", "open-on-github": "1.3.0", - "package-generator": "1.2.0", + "package-generator": "1.3.0", "settings-view": "0.253.0", "snippets": "1.1.9", "spell-check": "0.72.3", From 0192545f3d4795a128ed49c9229d6a813ddc535b Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Thu, 16 Nov 2017 12:57:39 -0800 Subject: [PATCH 13/18] Pin nan to 2.7.0 as 2.8.0 breaks on Windows with corruption/crashing --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 5287907c7..7fe4a2ad2 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "mocha-junit-reporter": "^1.13.0", "mocha-multi-reporters": "^1.1.4", "mock-spawn": "^0.2.6", + "nan": "2.7.0", "normalize-package-data": "^2.0.0", "nslog": "^3", "oniguruma": "6.2.1", From b3e9989cd20b3894b36e969b209d25ae06ab7ff7 Mon Sep 17 00:00:00 2001 From: Michelle Tilley Date: Thu, 16 Nov 2017 14:26:21 -0800 Subject: [PATCH 14/18] Translate line and column numbers from URI handlers The URI query string should specify line and column numbers as a user would, starting at 1, while the Atom API starts at 0. --- src/core-uri-handlers.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core-uri-handlers.js b/src/core-uri-handlers.js index 2af00f610..b2ddbbc25 100644 --- a/src/core-uri-handlers.js +++ b/src/core-uri-handlers.js @@ -1,9 +1,16 @@ +// Converts a query string parameter for a line or column number +// to a zero-based line or column number for the Atom API. +function getLineColNumber (numStr) { + const num = parseInt(numStr || 0, 10) + return Math.max(num - 1, 0) +} + function openFile (atom, {query}) { const {filename, line, column} = query atom.workspace.open(filename, { - initialLine: parseInt(line || 0, 10), - initialColumn: parseInt(column || 0, 10), + initialLine: getLineColNumber(line), + initialColumn: getLineColNumber(column), searchAllPanes: true }) } From f4b8974b7deb0e066855cd45bff764097f05a477 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 16 Nov 2017 17:13:43 -0800 Subject: [PATCH 15/18] :arrow_up: text-buffer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7fe4a2ad2..b371b101f 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "service-hub": "^0.7.4", "sinon": "1.17.4", "temp": "^0.8.3", - "text-buffer": "13.8.5", + "text-buffer": "13.8.6", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", "winreg": "^1.2.1", From 5de60b4ebcbb25a7f498378cc158afeba096f25a Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 16 Nov 2017 17:39:35 -0800 Subject: [PATCH 16/18] Remove explicit nan dependency; superstring now works w/ nan 2.8 --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index b371b101f..9a3bea755 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "mocha-junit-reporter": "^1.13.0", "mocha-multi-reporters": "^1.1.4", "mock-spawn": "^0.2.6", - "nan": "2.7.0", "normalize-package-data": "^2.0.0", "nslog": "^3", "oniguruma": "6.2.1", From 90a7ddb38d14f6d95be73588e799e7614fc9a322 Mon Sep 17 00:00:00 2001 From: U8N WXD Date: Fri, 17 Nov 2017 07:48:57 +0000 Subject: [PATCH 17/18] Repair Links in build-status.md Repair the link `YAML` in docs/build-instructions/build-status.md [ci skip] Signed-off-by: U8N WXD --- docs/build-instructions/build-status.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-instructions/build-status.md b/docs/build-instructions/build-status.md index e4fca6661..9bc806e88 100644 --- a/docs/build-instructions/build-status.md +++ b/docs/build-instructions/build-status.md @@ -114,4 +114,4 @@ | [TODO](https://github.com/atom/language-todo) | [![macOS Build Status](https://travis-ci.org/atom/language-todo.svg?branch=master)](https://travis-ci.org/atom/language-todo) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/gcgb9m7h146lv6qp/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-todo/branch/master) | | [TOML](https://github.com/atom/language-toml) | [![macOS Build Status](https://travis-ci.org/atom/language-toml.svg?branch=master)](https://travis-ci.org/atom/language-toml) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/kohao3fjyk6xv0sc/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-toml/branch/master) | | [XML](https://github.com/atom/language-xml) | [![macOS Build Status](https://travis-ci.org/atom/language-xml.svg?branch=master)](https://travis-ci.org/atom/language-xml) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/m5f6rn74a6h3q5uq/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-xml/branch/master) | -| [YAML](https://github/atom/language-yaml) | [![macOS Build Status](https://travis-ci.org/atom/language-yaml.svg?branch=master)](https://travis-ci.org/atom/language-yaml) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/eaa4ql7kipgphc2n/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-yaml/branch/master) | +| [YAML](https://github.com/atom/language-yaml) | [![macOS Build Status](https://travis-ci.org/atom/language-yaml.svg?branch=master)](https://travis-ci.org/atom/language-yaml) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/eaa4ql7kipgphc2n/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-yaml/branch/master) | From d72cc6437bd7b0b8852f0e19705b6153c7ef94be Mon Sep 17 00:00:00 2001 From: Justin Ratner Date: Fri, 17 Nov 2017 10:50:03 -0700 Subject: [PATCH 18/18] :arrow_up: find-and-replace@0.215.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a3bea755..f9e885cca 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "dev-live-reload": "0.48.1", "encoding-selector": "0.23.7", "exception-reporting": "0.41.5", - "find-and-replace": "0.214.0", + "find-and-replace": "0.215.0", "fuzzy-finder": "1.7.3", "github": "0.8.2", "git-diff": "1.3.6",