Merge pull request #254 from levrado/fix_bug_with_scoped_package_path

fix issue with `@` symbol in relative path

Author: JPinkney

src/languageservice/utils/paths.ts

@@ -3,7 +3,7 @@ import { join, normalize } from 'path';
 import { URI } from 'vscode-uri';
 
 export const isRelativePath = (path: string): boolean => {
-    const relativePathRegex = /^(((\.\.?)|([\w-\. ]+))(\/|\\\\?))*[\w-\. ]*\.[\w-]+$/i;
+    const relativePathRegex = /^(((\.\.?)|([\w-@\. ]+))(\/|\\\\?))*[\w-\. ]*\.[\w-]+$/i;
     return relativePathRegex.test(path);
 };
 

test/paths.test.ts

@@ -132,6 +132,11 @@ suite('File path tests', () => {
                       'file:///usr/testuser/relative/path/file.json',
                       'file:///c%3A/Users/testuser/relative/path/file.json');
 
+        checkGoodPath(join('..', '..', 'relative', '@path', 'file.json'),
+                      'file:///relative/%40path/file.json',
+                      'file:///usr/testuser/relative/%40path/file.json',
+                      'file:///c%3A/Users/testuser/relative/%40path/file.json');
+
         describe('Relative path = a workspace folder', () => {
             const path1 = join('aFolder', 'file.json');
             const path2 = join('folder-2', 'file.json');