Merge pull request #207 from micbou/drive-letter

Remove LowerCaseDriveLetter function
OmniSharp · Aug 29, 2015 · e190291 · e190291
2 parents 2ae4019 + 523a820
commit e190291
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 17 deletions.
diff --git a/OmniSharp.Tests/FakeSolution.cs b/OmniSharp.Tests/FakeSolution.cs
@@ -32,13 +32,13 @@ public CSharpFile GetFile(string filename)
         {
             return (from project in Projects
                     from file in project.Files
-                    where file.FileName.LowerCaseDriveLetter() == filename
+                    where file.FileName == filename
                     select file).FirstOrDefault();
         }
 
         public IProject ProjectContainingFile(string filename)
         {
-            return Projects.FirstOrDefault(p => p.Files.Any(f => f.FileName.LowerCaseDriveLetter().Equals(filename.LowerCaseDriveLetter(), StringComparison.InvariantCultureIgnoreCase)));
+            return Projects.FirstOrDefault(p => p.Files.Any(f => f.FileName.Equals(filename, StringComparison.InvariantCultureIgnoreCase)));
         }
 
         public void Reload()

diff --git a/OmniSharp.Tests/Solution/SolutionTest.cs b/OmniSharp.Tests/Solution/SolutionTest.cs
@@ -60,7 +60,7 @@ public void Should_put_unknown_file_into_orphan_project()
         [Test]
         public void Should_put_unknown_file_near_to_close_project_file()
         {
-            _solution.ProjectContainingFile((Environment.CurrentDirectory + "/Solution/minimal/minimal/test.cs").LowerCaseDriveLetter())
+            _solution.ProjectContainingFile((Environment.CurrentDirectory + "/Solution/minimal/minimal/test.cs"))
                 .Title.ShouldEqual("minimal");
         }
 

diff --git a/OmniSharp/Common/Request.cs b/OmniSharp/Common/Request.cs
@@ -13,9 +13,9 @@ public string FileName
             get { return _fileName; }
             set
             {
-                _fileName = value.ApplyPathReplacementsForServer().LowerCaseDriveLetter();
+                _fileName = value.ApplyPathReplacementsForServer();
             }
         }
     }
 }
-
+
diff --git a/OmniSharp/FindUsages/FindUsagesHandler.cs b/OmniSharp/FindUsages/FindUsagesHandler.cs
@@ -35,7 +35,7 @@ public QuickFixResponse FindUsages(FindUsagesRequest request)
         {
             var result = FindUsageNodes(request)
                             .Distinct(new NodeComparer())
-                            .OrderBy(n => n.GetRegion().FileName.LowerCaseDriveLetter())
+                            .OrderBy(n => n.GetRegion().FileName)
                             .ThenBy(n => n.StartLocation.Line)
                             .ThenBy(n => n.StartLocation.Column);
 
@@ -45,7 +45,7 @@ public QuickFixResponse FindUsages(FindUsagesRequest request)
                 var usages = result.Select(node => new QuickFix
                 {
                     FileName = node.GetRegion().FileName,
-                    Text = node.Preview(_solution.GetFile(node.GetRegion().FileName.LowerCaseDriveLetter()), request.MaxWidth).Replace("'", "''"),
+                    Text = node.Preview(_solution.GetFile(node.GetRegion().FileName), request.MaxWidth).Replace("'", "''"),
                     Line = node.StartLocation.Line,
                     Column = node.StartLocation.Column,
                 });
@@ -120,7 +120,7 @@ public IEnumerable<AstNode> FindUsageNodes(Request request)
 
                     Parallel.ForEach(interesting.Distinct(), file =>
                         {
-                            string text = _solution.GetFile(file.FileName.LowerCaseDriveLetter()).Content.Text;
+                            string text = _solution.GetFile(file.FileName).Content.Text;
                             SyntaxTree unit ;
                             if(project.CompilerSettings!=null){
                             	unit = new CSharpParser(project.CompilerSettings).Parse(text, file.FileName);

diff --git a/OmniSharp/GotoDefinition/GotoDefinitionHandler.cs b/OmniSharp/GotoDefinition/GotoDefinitionHandler.cs
@@ -27,7 +27,7 @@ public GotoDefinitionResponse GetGotoDefinitionResponse(GotoDefinitionRequest re
             if (resolveResult != null)
             {
                 var region = resolveResult.GetDefinitionRegion();
-                response.FileName = region.FileName == null ? null : region.FileName.LowerCaseDriveLetter().ApplyPathReplacementsForClient();
+                response.FileName = region.FileName == null ? null : region.FileName.ApplyPathReplacementsForClient();
                 response.Line = region.BeginLine;
                 response.Column = region.BeginColumn;
             }

diff --git a/OmniSharp/ProjectManipulation/AddReference/AddFileReferenceProcessor.cs b/OmniSharp/ProjectManipulation/AddReference/AddFileReferenceProcessor.cs
@@ -36,7 +36,7 @@ public AddReferenceResponse AddReference(IProject project, string reference)
                     projectXml.Element(MsBuildNameSpace + "Project").Add(projectItemGroup);
                 }
 
-                project.AddReference(reference.LowerCaseDriveLetter());
+                project.AddReference(reference);
                 project.Save(projectXml);
 
                 response.Message = string.Format("Reference to {0} added successfully", referenceName);

diff --git a/OmniSharp/Rename/RenameHandler.cs b/OmniSharp/Rename/RenameHandler.cs
@@ -40,7 +40,7 @@ public RenameResponse Rename(RenameRequest req)
             var modfiedFiles = new List<ModifiedFileResponse>();
             response.Changes = modfiedFiles;
 
-            foreach (IGrouping<string, AstNode> groupedNodes in nodes.GroupBy(n => n.GetRegion().FileName.LowerCaseDriveLetter()))
+            foreach (IGrouping<string, AstNode> groupedNodes in nodes.GroupBy(n => n.GetRegion().FileName))
             {
                 string fileName = groupedNodes.Key;
                 OmniSharpRefactoringContext context;

diff --git a/OmniSharp/Solution/CSharpSolution.cs b/OmniSharp/Solution/CSharpSolution.cs
@@ -81,7 +81,7 @@ public void LoadSolution()
                 {
                     string typeGuid = match.Groups["TypeGuid"].Value;
                     string title = match.Groups["Title"].Value;
-                    string location = Path.Combine(directory, match.Groups["Location"].Value).LowerCaseDriveLetter();
+                    string location = Path.Combine(directory, match.Groups["Location"].Value);
                     string guid = match.Groups["Guid"].Value;
 
                     switch (typeGuid.ToUpperInvariant())

diff --git a/OmniSharp/Solution/StringExtensions.cs b/OmniSharp/Solution/StringExtensions.cs
@@ -18,11 +18,6 @@ public static string MultipleWhitespaceCharsToSingleSpace
             return Regex.Replace(stringToTrim, @"\s+", " ");
         }
 
-        public static string LowerCaseDriveLetter(this string path)
-        {
-        	return path.Replace(@"C:\", @"c:\").Replace(@"D:\", @"d:\");
-        }
-
 		public static string ForceWindowsPathSeparator(this string path)
 		{
 			return path.Replace ('/', '\\');