Merge pull request #13545 from atom/mb-preserve-unresolved-paths

Don't convert paths to real paths when building text buffers
This commit is contained in:
Max Brunsfeld
2017-01-04 16:38:37 -08:00
committed by GitHub
2 changed files with 5 additions and 5 deletions

View File

@@ -49,7 +49,7 @@
"normalize-package-data": "^2.0.0",
"nslog": "^3",
"oniguruma": "6.1.0",
"pathwatcher": "^6.7.1",
"pathwatcher": "6.8.0",
"postcss": "5.2.4",
"postcss-selector-parser": "2.2.1",
"property-accessors": "^1.1.3",
@@ -111,7 +111,7 @@
"keybinding-resolver": "0.35.0",
"line-ending-selector": "0.5.1",
"link": "0.31.2",
"markdown-preview": "0.159.1",
"markdown-preview": "0.159.2",
"metrics": "1.1.2",
"notifications": "0.65.2",
"open-on-github": "1.2.1",
@@ -124,7 +124,7 @@
"symbols-view": "0.114.0",
"tabs": "0.103.1",
"timecop": "0.33.2",
"tree-view": "0.213.0",
"tree-view": "0.213.1",
"update-package-dependencies": "0.10.0",
"welcome": "0.35.2",
"whitespace": "0.36.1",

View File

@@ -225,11 +225,11 @@ class Project extends Model
uri
else
if fs.isAbsolute(uri)
path.normalize(fs.absolute(uri))
path.normalize(fs.resolveHome(uri))
# TODO: what should we do here when there are multiple directories?
else if projectPath = @getPaths()[0]
path.normalize(fs.absolute(path.join(projectPath, uri)))
path.normalize(fs.resolveHome(path.join(projectPath, uri)))
else
undefined