Skip to content

Commit

Permalink
Revert "path: resolve normalize drive letter to lower case"
Browse files Browse the repository at this point in the history
This reverts commit f6e5740.

Changing drive letters to lowercase violates the principle of
least surprise. Other functions that do this should get fixed too.

Conflicts:
	lib/path.js

PR-URL: #100
Reviewed-By: Bert Belder <bertbelder@gmail.com>
  • Loading branch information
seishun authored and piscisaureus committed Dec 8, 2014
1 parent e3aa802 commit e24fa83
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
6 changes: 0 additions & 6 deletions lib/path.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,6 @@ win32.resolve = function() {
resolvedTail = normalizeArray(resolvedTail.split(/[\\\/]+/).filter(f),
!resolvedAbsolute).join('\\');

// If device is a drive letter, we'll normalize to lower case.
if (resolvedDevice && resolvedDevice.charAt(1) === ':') {
resolvedDevice = resolvedDevice[0].toLowerCase() +
resolvedDevice.substr(1);
}

return (resolvedDevice + (resolvedAbsolute ? '\\' : '') + resolvedTail) ||
'.';
};
Expand Down
5 changes: 2 additions & 3 deletions test/simple/test-module-nodemodulepaths.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

var common = require('../common');
var assert = require('assert');
var path = require('path');

var module = require('module');

Expand All @@ -30,7 +29,7 @@ var isWindows = process.platform === 'win32';
var file, delimiter, paths;

if (isWindows) {
file = path.normalize('C:\\Users\\Rocko Artischocko\\node_stuff\\foo');
file = 'C:\\Users\\Rocko Artischocko\\node_stuff\\foo';
delimiter = '\\'
} else {
file = '/usr/test/lib/node_modules/npm/foo';
Expand All @@ -40,4 +39,4 @@ if (isWindows) {
paths = module._nodeModulePaths(file);

assert.ok(paths.indexOf(file + delimiter + 'node_modules') !== -1);
assert.ok(Array.isArray(paths));
assert.ok(Array.isArray(paths));
2 changes: 1 addition & 1 deletion test/simple/test-path.js
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ if (isWindows) {
[['c:/ignore', 'd:\\a/b\\c/d', '\\e.exe'], 'd:\\e.exe'],
[['c:/ignore', 'c:/some/file'], 'c:\\some\\file'],
[['d:/ignore', 'd:some/dir//'], 'd:\\ignore\\some\\dir'],
[['.'], path.normalize(process.cwd())],
[['.'], process.cwd()],
[['//server/share', '..', 'relative\\'], '\\\\server\\share\\relative'],
[['c:/', '//'], 'c:\\'],
[['c:/', '//dir'], 'c:\\dir'],
Expand Down

0 comments on commit e24fa83

Please sign in to comment.