fixes add reference for *nix

OmniSharp · Dec 27, 2013 · 785be4d · 785be4d
1 parent 5f5df2d
commit 785be4d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/OmniSharp.Tests/ProjectManipulation/AddReference/AddFileReferenceTests.cs b/OmniSharp.Tests/ProjectManipulation/AddReference/AddFileReferenceTests.cs
@@ -3,6 +3,7 @@
 using NUnit.Framework;
 using OmniSharp.ProjectManipulation.AddReference;
 using Should;
+using OmniSharp.Solution;
 
 namespace OmniSharp.Tests.ProjectManipulation.AddReference
 {
@@ -42,7 +43,7 @@ public void CanAddFileReference()
 
             project.AsXml().ToString().ShouldEqual(expectedXml.ToString());
             ((FakeAssembly)project.References.First(r => r.GetType() == typeof(FakeAssembly)))
-				.AssemblyPath.ShouldEqual(@"c:\test\packages\SomeTest\lib\net40\Some.Test.dll");
+				.AssemblyPath.ForceWindowsPathSeparator().ShouldEqual(@"c:\test\packages\SomeTest\lib\net40\Some.Test.dll");
         }
 
         [Test]
@@ -74,7 +75,7 @@ public void CanAddFileReferenceWhenNoReferencesExist()
             handler.AddReference(request);
 
             project.AsXml().ToString().ShouldEqual(expectedXml.ToString());
-            ((FakeAssembly)project.References.First(r => r.GetType() == typeof(FakeAssembly))).AssemblyPath.ShouldEqual(@"c:\test\packages\SomeTest\lib\net40\Some.Test.dll");
+			((FakeAssembly)project.References.First(r => r.GetType() == typeof(FakeAssembly))).AssemblyPath.ForceWindowsPathSeparator().ShouldEqual(@"c:\test\packages\SomeTest\lib\net40\Some.Test.dll");
         }
 
         [Test]

diff --git a/OmniSharp/AutoComplete/AutoCompleteHandler.cs b/OmniSharp/AutoComplete/AutoCompleteHandler.cs
@@ -25,13 +25,12 @@ public AutoCompleteHandler(ISolution solution, BufferParser parser, Logger logge
         public IEnumerable<ICompletionData> CreateProvider(AutoCompleteRequest request)
         {
             request.Column = request.Column - request.WordToComplete.Length;
-
             var completionContext = new BufferContext (request, _parser);
 
             var partialWord = request.WordToComplete;
 
             var project = _solution.ProjectContainingFile(request.FileName);
-
+	    
             ICompletionContextProvider contextProvider = new DefaultCompletionContextProvider
                 (completionContext.Document, completionContext.ParsedContent.UnresolvedFile);
 
@@ -50,7 +49,6 @@ public IEnumerable<ICompletionData> CreateProvider(AutoCompleteRequest request)
                 {
                     EolMarker = Environment.NewLine
                 };
-
             _logger.Debug("Getting Completion Data");
 
             IEnumerable<ICompletionData> data = engine.GetCompletionData(completionContext.CursorPosition, true);

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.FixPath().Replace('/', '\\'));
+                project.AddReference(reference.FixPath());
                 project.Save(projectXml);
 
                 response.Message = string.Format("Reference to {0} added successfully", referenceName);

diff --git a/OmniSharp/Solution/CSharpProject.cs b/OmniSharp/Solution/CSharpProject.cs
@@ -220,6 +220,10 @@ public override string ToString()
 
         public static IUnresolvedAssembly LoadAssembly(string assemblyFileName)
         {
+			if (!File.Exists (assemblyFileName)) 
+			{
+				throw new FileNotFoundException ("Assembly does not exist!", assemblyFileName);
+			}
             return assemblyDict.GetOrAdd(assemblyFileName, file => new CecilLoader().LoadAssemblyFile(file));
         }
 

diff --git a/OmniSharp/Solution/StringExtensions.cs b/OmniSharp/Solution/StringExtensions.cs
@@ -32,6 +32,11 @@ public static string FixPath(this string path)
 			return path;
         }
 
+		public static string ForceWindowsPathSeparator(this string path)
+		{
+			return path.Replace ('/', '\\');
+		}
+
         /// <summary>
         /// Returns the relative path of a file to another file
         /// </summary>
@@ -42,5 +47,7 @@ public static string GetRelativePath(this string path, string pathToMakeRelative
         {
             return new Uri(path).MakeRelativeUri(new Uri(pathToMakeRelative)).ToString().Replace("/", @"\");
         }
+
+
     }
 }