From 134ef4f5a490b969dde141fcffba43f24d880b26 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 6 Mar 2017 11:15:33 +0100 Subject: [PATCH 1/9] :arrow_up: fs-plus --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97d523fa4..1d884c8dd 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "event-kit": "^2.1.0", "find-parent-dir": "^0.3.0", "first-mate": "6.3.0", - "fs-plus": "2.10.1", + "fs-plus": "^3.0.0", "fstream": "0.1.24", "fuzzaldrin": "^2.1", "git-utils": "4.1.2", From 4f4fed6cb83ae24897b16412161af14aa9227359 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 6 Mar 2017 12:57:27 +0100 Subject: [PATCH 2/9] Upgrade fs-plus on Atom packages and node modules --- package.json | 62 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 1d884c8dd..7814c79ff 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "electronVersion": "1.3.13", "dependencies": { "async": "0.2.6", - "atom-keymap": "7.1.22", + "atom-keymap": "8.0.2", "atom-select-list": "0.0.15", "atom-ui": "0.4.1", "babel-core": "6.22.1", @@ -40,18 +40,18 @@ "devtron": "1.3.0", "event-kit": "^2.1.0", "find-parent-dir": "^0.3.0", - "first-mate": "6.3.0", + "first-mate": "7.0.2", "fs-plus": "^3.0.0", "fstream": "0.1.24", "fuzzaldrin": "^2.1", - "git-utils": "4.1.2", + "git-utils": "5.0.0", "glob": "^7.1.1", "grim": "1.5.0", "jasmine-json": "~0.0", "jasmine-tagged": "^1.1.4", "jquery": "2.1.4", "key-path-helpers": "^0.4.0", - "less-cache": "0.23", + "less-cache": "1.0.0", "line-top-index": "0.2.0", "marked": "^0.3.6", "minimatch": "^3.0.3", @@ -60,23 +60,23 @@ "normalize-package-data": "^2.0.0", "nslog": "^3", "oniguruma": "6.1.0", - "pathwatcher": "6.9.0", + "pathwatcher": "7.0.0", "postcss": "5.2.4", "postcss-selector-parser": "2.2.1", "property-accessors": "^1.1.3", "random-words": "0.0.1", "resolve": "^1.1.6", "runas": "^3.1", - "scandal": "2.2.2", + "scandal": "^3.0.0", "scoped-property-store": "^0.17.0", "scrollbar-style": "^3.2", - "season": "^5.4.1", + "season": "^6.0.0", "semver": "^4.3.3", "service-hub": "^0.7.2", "sinon": "1.17.4", "source-map-support": "^0.3.2", "temp": "0.8.1", - "text-buffer": "10.4.2", + "text-buffer": "11.0.0", "typescript-simple": "1.0.0", "underscore-plus": "^1.6.6", "winreg": "^1.2.1", @@ -96,47 +96,47 @@ "solarized-dark-syntax": "1.1.2", "solarized-light-syntax": "1.1.2", "about": "1.7.5", - "archive-view": "0.63.0", + "archive-view": "0.63.1", "autocomplete-atom-api": "0.10.0", "autocomplete-css": "0.15.0", "autocomplete-html": "0.7.2", "autocomplete-plus": "2.34.2", "autocomplete-snippets": "1.11.0", "autoflow": "0.29.0", - "autosave": "0.24.0", + "autosave": "0.24.1", "background-tips": "0.26.1", "bookmarks": "0.44.2", - "bracket-matcher": "0.85.3", + "bracket-matcher": "0.85.4", "command-palette": "0.40.3", "dalek": "0.2.0", - "deprecation-cop": "0.56.2", - "dev-live-reload": "0.47.0", + "deprecation-cop": "0.56.4", + "dev-live-reload": "0.47.1", "encoding-selector": "0.23.2", - "exception-reporting": "0.41.2", - "find-and-replace": "0.207.0", - "fuzzy-finder": "1.5.0", - "git-diff": "1.3.3", + "exception-reporting": "0.41.3", + "find-and-replace": "0.207.1", + "fuzzy-finder": "1.5.1", + "git-diff": "1.3.4", "go-to-line": "0.32.0", "grammar-selector": "0.49.3", - "image-view": "0.61.1", + "image-view": "0.61.2", "incompatible-packages": "0.27.1", - "keybinding-resolver": "0.36.3", + "keybinding-resolver": "0.36.4", "line-ending-selector": "0.6.2", - "link": "0.31.2", - "markdown-preview": "0.159.7", - "metrics": "1.2.1", - "notifications": "0.66.2", + "link": "0.31.3", + "markdown-preview": "0.159.9", + "metrics": "1.2.2", + "notifications": "0.67.1", "open-on-github": "1.2.1", - "package-generator": "1.1.0", - "settings-view": "0.248.0", - "snippets": "1.1.1", + "package-generator": "1.1.1", + "settings-view": "0.248.2", + "snippets": "1.1.3", "spell-check": "0.71.1", - "status-bar": "1.8.3", - "styleguide": "0.49.3", - "symbols-view": "0.115.2", - "tabs": "0.104.2", + "status-bar": "1.8.4", + "styleguide": "0.49.4", + "symbols-view": "0.115.3", + "tabs": "0.104.3", "timecop": "0.36.0", - "tree-view": "0.215.1", + "tree-view": "0.215.2", "update-package-dependencies": "0.11.0", "welcome": "0.36.2", "whitespace": "0.36.2", From 025de31846af1eea852604be8d6c28d4bd973f2a Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 23 Aug 2016 11:07:52 -0700 Subject: [PATCH 3/9] Avoid using less imports in nested scopes Apparently, these imports of 'octicon-utf-codes.less' within mixin definitions cause any subsequent imports of this file to become noops, because of the way less dedupes imports. The result is that the variables defined in that file are only available in the nested scope. This didn't happen in older versions of less because of bugs which have been fixed since less 2.7. Signed-off-by: Antonio Scandurra --- static/variables/octicon-mixins.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/variables/octicon-mixins.less b/static/variables/octicon-mixins.less index c58ce3a52..672a2cef6 100644 --- a/static/variables/octicon-mixins.less +++ b/static/variables/octicon-mixins.less @@ -1,3 +1,5 @@ +@import "octicon-utf-codes.less"; + .icon-size(@size) { font-size: @size; width: @size; @@ -17,7 +19,6 @@ } .octicon(@name, @size: 16px) { - @import "octicon-utf-codes.less"; &::before { .icon(@size); content: @@name @@ -25,7 +26,6 @@ } .mega-octicon(@name, @size: 32px) { - @import "octicon-utf-codes.less"; &::before { .icon(@size); content: @@name From 778db180dbb683e1c9e863c806321bdff13125bb Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 6 Mar 2017 13:34:43 +0100 Subject: [PATCH 4/9] Fix Workspace specs --- spec/workspace-spec.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/workspace-spec.js b/spec/workspace-spec.js index 270f81526..5279092c0 100644 --- a/spec/workspace-spec.js +++ b/spec/workspace-spec.js @@ -1347,7 +1347,9 @@ i = /test/; #FIXME\ matchText: 'aaa', lineText: 'aaa bbb', lineTextOffset: 0, - range: [[0, 0], [0, 3]] + range: [[0, 0], [0, 3]], + linesAfter: [], + linesBefore: [] }) }) }) @@ -1365,7 +1367,9 @@ i = /test/; #FIXME\ matchText: '$bill', lineText: 'dollar$bill', lineTextOffset: 0, - range: [[2, 6], [2, 11]] + range: [[2, 6], [2, 11]], + linesAfter: [], + linesBefore: [] }) }) }) From e74737d38e8ab0a2eab434b83c0b33b595534e76 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 6 Mar 2017 14:39:04 +0100 Subject: [PATCH 5/9] Fix ThemeManager specs --- spec/theme-manager-spec.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee index 795f1b43e..7c43ac2f3 100644 --- a/spec/theme-manager-spec.coffee +++ b/spec/theme-manager-spec.coffee @@ -194,10 +194,10 @@ describe "atom.themes", -> expect(element.getAttribute('source-path')).toEqualPath lessPath expect(element.textContent).toBe """ #header { - color: #4d926f; + color: #4D926F; } h2 { - color: #4d926f; + color: #4D926F; } """ From a9f91cc96e65a21627fdb85d0f4a96d9d22dee85 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 6 Mar 2017 16:18:40 +0100 Subject: [PATCH 6/9] Delete test verifying that `GitRepository.open` works with file paths With the upgrade of git-utils libgit2 was updated too and the behavior tested by the deleted spec doesn't seem to be supported anymore. However, we believe we can delete this test because the only entry point for creating `GitRepository` instances is `repositoryForDirectorySync` in `GitRepositoryProvider`, which only allows `Directory` objects to be supplied as its input arguments. --- spec/git-repository-spec.coffee | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spec/git-repository-spec.coffee b/spec/git-repository-spec.coffee index 59e8c4c68..f1c433d76 100644 --- a/spec/git-repository-spec.coffee +++ b/spec/git-repository-spec.coffee @@ -31,11 +31,6 @@ describe "GitRepository", -> expect(-> new GitRepository(path.join(temp.dir, 'nogit.txt'))).toThrow() describe ".getPath()", -> - it "returns the repository path for a .git directory path with a file", -> - return if process.platform is 'win32' #Win32TestFailures - libgit2 does not detect files in .git folders - repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git', 'HEAD')) - expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git') - it "returns the repository path for a .git directory path with a directory", -> repo = new GitRepository(path.join(__dirname, 'fixtures', 'git', 'master.git', 'objects')) expect(repo.getPath()).toBe path.join(__dirname, 'fixtures', 'git', 'master.git') From 1846f9e233e16c0015eb0a9504b992e016ec12ac Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 6 Mar 2017 17:02:56 +0100 Subject: [PATCH 7/9] Invalidate compile cache on AppVeyor --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3d8c0b274..921d14167 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,4 +51,3 @@ cache: - '%APPVEYOR_BUILD_FOLDER%\node_modules' - '%APPVEYOR_BUILD_FOLDER%\electron' - '%USERPROFILE%\.atom\.apm' - - '%USERPROFILE%\.atom\compile-cache' From 46b06a43368d509f04929523287909c1d51f29e6 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 6 Mar 2017 17:44:18 +0100 Subject: [PATCH 8/9] Put back `.atom/compile-cache` on AppVeyor --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 921d14167..3d8c0b274 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,3 +51,4 @@ cache: - '%APPVEYOR_BUILD_FOLDER%\node_modules' - '%APPVEYOR_BUILD_FOLDER%\electron' - '%USERPROFILE%\.atom\.apm' + - '%USERPROFILE%\.atom\compile-cache' From 33f96bf6cb1723024dcf02f802e147f635364979 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Fri, 10 Mar 2017 09:01:10 +0100 Subject: [PATCH 9/9] Fix workspace-spec.js --- spec/workspace-spec.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spec/workspace-spec.js b/spec/workspace-spec.js index 5279092c0..270f81526 100644 --- a/spec/workspace-spec.js +++ b/spec/workspace-spec.js @@ -1347,9 +1347,7 @@ i = /test/; #FIXME\ matchText: 'aaa', lineText: 'aaa bbb', lineTextOffset: 0, - range: [[0, 0], [0, 3]], - linesAfter: [], - linesBefore: [] + range: [[0, 0], [0, 3]] }) }) }) @@ -1367,9 +1365,7 @@ i = /test/; #FIXME\ matchText: '$bill', lineText: 'dollar$bill', lineTextOffset: 0, - range: [[2, 6], [2, 11]], - linesAfter: [], - linesBefore: [] + range: [[2, 6], [2, 11]] }) }) })