Merge branch 'master' into iz-gutter-click-select-whole-soft-wrapped-line

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"
   }
 }

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",
@@ -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.66.0",
     "language-git": "0.10.0",
     "language-go": "0.21.0",
     "language-html": "0.29.0",

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])

src/default-directory-provider.coffee

@@ -16,10 +16,10 @@ 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)
+    else
+      projectPath
 
     new Directory(directoryPath)
 

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.

src/scrollbar-corner-component.coffee

@@ -1,6 +1,6 @@
 module.exports =
 class ScrollbarCornerComponent
-  constructor: () ->
+  constructor: ->
     @domNode = document.createElement('div')
     @domNode.classList.add('scrollbar-corner')
 

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
+}

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 {