From 2dcdbb5a927e395653e00a7d5c2a104b77a0a6d9 Mon Sep 17 00:00:00 2001 From: simurai Date: Thu, 26 Feb 2015 12:07:51 +0900 Subject: [PATCH 01/10] Only set a font-size in the root No need to select `html` and `body` when trying to override it. Issue: #5735 --- static/bootstrap-overrides.less | 5 +++++ static/workspace-view.less | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/static/bootstrap-overrides.less b/static/bootstrap-overrides.less index 1ac35ab79..258de6320 100644 --- a/static/bootstrap-overrides.less +++ b/static/bootstrap-overrides.less @@ -21,3 +21,8 @@ h5, h6 { font-family: inherit; // inherit from themes } + +body { + font-family: inherit; // inherit from html + font-size: inherit; // inherit from html +} diff --git a/static/workspace-view.less b/static/workspace-view.less index 9f988bf46..668a30777 100644 --- a/static/workspace-view.less +++ b/static/workspace-view.less @@ -3,13 +3,16 @@ @font-face { .octicon-font(); } +html { + font-family: @font-family; + font-size: @font-size; +} + html, body { width: 100%; height: 100%; overflow: hidden; - font-family: @font-family; - font-size: @font-size; } atom-workspace { From ad0669d814e01967997358319bbf16ebcb7158f6 Mon Sep 17 00:00:00 2001 From: Mostafa Eweda Date: Fri, 27 Feb 2015 15:49:18 -0800 Subject: [PATCH 02/10] Default directory provider should handle only local filesystem directories --- src/default-directory-provider.coffee | 5 ++++- src/project.coffee | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/default-directory-provider.coffee b/src/default-directory-provider.coffee index 7ecdbd354..5ddc89cca 100644 --- a/src/default-directory-provider.coffee +++ b/src/default-directory-provider.coffee @@ -21,7 +21,10 @@ class DefaultDirectoryProvider else path.dirname(projectPath) - new Directory(directoryPath) + if fs.isDirectorySync(projectPath) + return new Directory(directoryPath) + else + return null # Public: Create a Directory that corresponds to the specified URI. # diff --git a/src/project.coffee b/src/project.coffee index c92462ead..946ae4c55 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -39,6 +39,7 @@ class Project extends Model @emitter = new Emitter @buffers ?= [] @rootDirectories = [] + @packageRootDirectoryPaths = [] @repositories = [] @directoryProviders = [new DefaultDirectoryProvider()] @@ -203,10 +204,12 @@ class Project extends Model for provider in @directoryProviders break if directory = provider.directoryForURISync?(projectPath) if directory is null - # This should never happen because DefaultDirectoryProvider should always - # return a Directory. - throw new Error(projectPath + ' could not be resolved to a directory') - @rootDirectories.push(directory) + # DefaultDirectoryProvider doesn't handle specific directory protocols + # Atom Packages may use packageDirectoryPaths to add thier own paths later. + @packageRootDirectoryPaths.push(projectPath) + return + else + @rootDirectories.push(directory) repo = null for provider in @repositoryProviders From ed8433cda45ab802fcb9b9ed30376f6645ce9325 Mon Sep 17 00:00:00 2001 From: Mostafa Eweda Date: Fri, 27 Feb 2015 17:47:40 -0800 Subject: [PATCH 03/10] nit: their --- src/project.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project.coffee b/src/project.coffee index 946ae4c55..79cd7439b 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -205,7 +205,7 @@ class Project extends Model break if directory = provider.directoryForURISync?(projectPath) if directory is null # DefaultDirectoryProvider doesn't handle specific directory protocols - # Atom Packages may use packageDirectoryPaths to add thier own paths later. + # Atom Packages may use packageDirectoryPaths to add their own paths later. @packageRootDirectoryPaths.push(projectPath) return else From 71272f538d36c08195a94896f2913710486c3ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=C5=BDu=C5=BEak?= Date: Mon, 2 Mar 2015 14:27:43 +0100 Subject: [PATCH 04/10] :arrow_up: welcome@0.25.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbcedb53a..4d807f29e 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "timecop": "0.31.0", "tree-view": "0.164.0", "update-package-dependencies": "0.8.0", - "welcome": "0.24.0", + "welcome": "0.25.0", "whitespace": "0.29.0", "wrap-guide": "0.31.0", "language-c": "0.41.0", From 9e369b5efc16eab92b6ead8eac2f2e8dd8c80f7c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 2 Mar 2015 09:01:18 -0800 Subject: [PATCH 05/10] :arrow_up: language-gfm@0.65 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d807f29e..d80124592 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "language-coffee-script": "0.39.0", "language-csharp": "0.5.0", "language-css": "0.28.0", - "language-gfm": "0.64.0", + "language-gfm": "0.65.0", "language-git": "0.10.0", "language-go": "0.21.0", "language-html": "0.29.0", From 9921d55724e80cb4e618c7fadaec9815d072cf6d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 2 Mar 2015 09:02:55 -0800 Subject: [PATCH 06/10] :arrow_up: apm@0.142 --- apm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm/package.json b/apm/package.json index f735cb6f4..7d894d573 100644 --- a/apm/package.json +++ b/apm/package.json @@ -6,6 +6,6 @@ "url": "https://github.com/atom/atom.git" }, "dependencies": { - "atom-package-manager": "0.141.0" + "atom-package-manager": "0.142.0" } } From 66141a6a1822b858dcc751324ffc603d53bb638f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 2 Mar 2015 09:10:11 -0800 Subject: [PATCH 07/10] Remove empty param list --- src/scrollbar-corner-component.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scrollbar-corner-component.coffee b/src/scrollbar-corner-component.coffee index c0fbdfd60..986d28f17 100644 --- a/src/scrollbar-corner-component.coffee +++ b/src/scrollbar-corner-component.coffee @@ -1,6 +1,6 @@ module.exports = class ScrollbarCornerComponent - constructor: () -> + constructor: -> @domNode = document.createElement('div') @domNode.classList.add('scrollbar-corner') From e5048b5ede251a9030260b0a0bc434d5671841fb Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 2 Mar 2015 13:05:38 -0800 Subject: [PATCH 08/10] :arrow_up: language-gfm@0.66 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d80124592..c7de1dafc 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "language-coffee-script": "0.39.0", "language-csharp": "0.5.0", "language-css": "0.28.0", - "language-gfm": "0.65.0", + "language-gfm": "0.66.0", "language-git": "0.10.0", "language-go": "0.21.0", "language-html": "0.29.0", From 2987d37373596ceaa8872cef88550b5c5660e38c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 2 Mar 2015 14:16:09 -0800 Subject: [PATCH 09/10] :fire: ; --- src/project.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/project.coffee b/src/project.coffee index c92462ead..b0c1ffb0b 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -53,7 +53,7 @@ class Project extends Model # to either a {Repository} or null. Ideally, the {Directory} would be used # as the key; however, there can be multiple {Directory} objects created for # the same real path, so it is not a good key. - @repositoryPromisesByPath = new Map(); + @repositoryPromisesByPath = new Map() # Note that the GitRepositoryProvider is registered synchronously so that # it is available immediately on startup. From b74a688baa1a23fcfda9d5715e74301deb83cfbd Mon Sep 17 00:00:00 2001 From: Mostafa Eweda Date: Mon, 2 Mar 2015 14:28:01 -0800 Subject: [PATCH 10/10] Bare minimum fix to the default directory provider --- spec/project-spec.coffee | 14 ++++++++++++++ src/default-directory-provider.coffee | 11 ++++------- src/project.coffee | 11 ++++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee index 0d115f56f..476d731ee 100644 --- a/spec/project-spec.coffee +++ b/spec/project-spec.coffee @@ -78,6 +78,20 @@ describe "Project", -> expect(directories.length).toBe 1 expect(directories[0].getPath()).toBe tmp + it "gets the parent directory from the default directory provider if it's a local directory", -> + tmp = temp.mkdirSync() + atom.project.setPaths([path.join(tmp, "not-existing")]) + directories = atom.project.getDirectories() + expect(directories.length).toBe 1 + expect(directories[0].getPath()).toBe tmp + + it "only normalizes the directory path if it isn't on the local filesystem", -> + nonLocalFsDirectory = "custom_proto://abc/def" + atom.project.setPaths([nonLocalFsDirectory]) + directories = atom.project.getDirectories() + expect(directories.length).toBe 1 + expect(directories[0].getPath()).toBe path.normalize(nonLocalFsDirectory) + it "tries to update repositories when a new RepositoryProvider is registered", -> tmp = temp.mkdirSync('atom-project') atom.project.setPaths([tmp]) diff --git a/src/default-directory-provider.coffee b/src/default-directory-provider.coffee index 5ddc89cca..a05c532a9 100644 --- a/src/default-directory-provider.coffee +++ b/src/default-directory-provider.coffee @@ -16,15 +16,12 @@ class DefaultDirectoryProvider directoryForURISync: (uri) -> projectPath = path.normalize(uri) - directoryPath = if fs.isDirectorySync(projectPath) - projectPath - else + directoryPath = if !fs.isDirectorySync(projectPath) and fs.isDirectorySync(path.dirname(projectPath)) path.dirname(projectPath) - - if fs.isDirectorySync(projectPath) - return new Directory(directoryPath) else - return null + projectPath + + new Directory(directoryPath) # Public: Create a Directory that corresponds to the specified URI. # diff --git a/src/project.coffee b/src/project.coffee index 79cd7439b..c92462ead 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -39,7 +39,6 @@ class Project extends Model @emitter = new Emitter @buffers ?= [] @rootDirectories = [] - @packageRootDirectoryPaths = [] @repositories = [] @directoryProviders = [new DefaultDirectoryProvider()] @@ -204,12 +203,10 @@ class Project extends Model for provider in @directoryProviders break if directory = provider.directoryForURISync?(projectPath) if directory is null - # DefaultDirectoryProvider doesn't handle specific directory protocols - # Atom Packages may use packageDirectoryPaths to add their own paths later. - @packageRootDirectoryPaths.push(projectPath) - return - else - @rootDirectories.push(directory) + # This should never happen because DefaultDirectoryProvider should always + # return a Directory. + throw new Error(projectPath + ' could not be resolved to a directory') + @rootDirectories.push(directory) repo = null for provider in @repositoryProviders