Merge pull request #206 from DavidVanDeursen/tilde-allowed-in-server-path

Added test and added tilde as allowed character in server name

Author: WillemJann

src/XLParser.Tests/FormulaAnalysisTest.cs

@@ -601,17 +601,6 @@ public void ExternalWorkbook()
             Assert.AreEqual("Sheet1", references.First().Worksheet);
         }
 
-        [TestMethod]
-        public void ExternalWorkbookNetworkPath()
-        {
-            List<ParserReference> references = new FormulaAnalyzer(@"='\\TEST-01\Folder\[Book1.xlsx]Sheet1'!$A$1").ParserReferences().ToList();
-
-            Assert.AreEqual(1, references.Count);
-            Assert.AreEqual(@"\\TEST-01\Folder\", references.First().FilePath);
-            Assert.AreEqual("Book1.xlsx", references.First().FileName);
-            Assert.AreEqual("Sheet1", references.First().Worksheet);
-        }
-
         [TestMethod]
         public void ExternalWorkbookUrlPathHttp()
         {
@@ -683,6 +672,29 @@ public void ExternalWorkbookUrlPathHttpWithEscapedSingleQuote()
             Assert.AreEqual("Sheet1", references.First().Worksheet);
         }
 
+        [TestMethod]
+        public void ExternalWorkbookNetworkPath()
+        {
+            List<ParserReference> references = new FormulaAnalyzer(@"='\\TEST-01\Folder\[Book1.xlsx]Sheet1'!$A$1").ParserReferences().ToList();
+
+            Assert.AreEqual(1, references.Count);
+            Assert.AreEqual(@"\\TEST-01\Folder\", references.First().FilePath);
+            Assert.AreEqual("Book1.xlsx", references.First().FileName);
+            Assert.AreEqual("Sheet1", references.First().Worksheet);
+        }
+
+        [TestMethod]
+        public void ExternalWorkbookNetworkPathWithTilde()
+        {
+            //See [#205] (https://github.com/spreadsheetlab/XLParser/issues/205)
+            List<ParserReference> references = new FormulaAnalyzer(@"='\\TEST-~01\Folder\[Book1.xlsx]Sheet1'!$A$1").ParserReferences().ToList();
+
+            Assert.AreEqual(1, references.Count);
+            Assert.AreEqual(@"\\TEST-~01\Folder\", references.First().FilePath);
+            Assert.AreEqual("Book1.xlsx", references.First().FileName);
+            Assert.AreEqual("Sheet1", references.First().Worksheet);
+        }
+        
         [TestMethod]
         public void ExternalWorkbookNetworkPathWithSpace()
         {
@@ -1426,4 +1438,4 @@ public void TestConstants()
         }
         #endregion
     }
-}
+}

src/XLParser/ExcelFormulaGrammar.cs

@@ -204,7 +204,7 @@ public class ExcelFormulaGrammar : Grammar
         { Priority = TerminalPriority.FileName };
 
         // Source: http://stackoverflow.com/a/6416209/572635
-        private const string windowsFilePathRegex = @"(?:[a-zA-Z]:|\\?\\?[\w\-.$ @]+)\\(([^<>\"" /\|?*\\']|( |''))*\\)*";
+        private const string windowsFilePathRegex = @"(?:[a-zA-Z]:|\\?\\?[\w\-.$ @~]+)\\(([^<>\"" /\|?*\\']|( |''))*\\)*";
         private const string urlPathRegex = @"http(s?)\://([\p{L}\p{N}-_]+\.[\p{L}\p{N}-_]*)+(:[0-9]+)?/([\p{L}\p{N}\-\.\?\,\'+&%\$#_ ()]*/)*";
         private const string filePathRegex = @"(" + windowsFilePathRegex + @"|" + urlPathRegex + @")";
         public Terminal FilePathToken { get; } = new RegexBasedTerminal(GrammarNames.TokenFilePath, filePathRegex)