Merge pull request #137 from risingphoenix/master

import namespace: correct paths on windows systems
erichard · Feb 5, 2020 · 329563a · 329563a
2 parents 85f69d0 + 5ede58f
commit 329563a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/php_companion/commands/import_namespace_command.py b/php_companion/commands/import_namespace_command.py
@@ -11,7 +11,7 @@ class ImportNamespaceCommand(sublime_plugin.TextCommand):
     def run(self, edit):
         projectPath = get_active_project_path()
         file_name = self.view.file_name().replace(projectPath, '')
-        if file_name.startswith('/'):
+        if file_name.startswith('/') or file_name.startswith('\\'):
             file_name = file_name[1:]
 
         # Abort if the file is not PHP

diff --git a/php_companion/utils.py b/php_companion/utils.py
@@ -83,17 +83,19 @@ def get_composer():
 def get_namespace(filename):
     data = get_composer()
     for _replace_with, _path in data['autoload']['psr-4'].items():
+		_path = normalize_to_system_style_path(_path)
         if _path.startswith('./'):
-            _path = _path[2:]     
+            _path = _path[2:]
 
         if filename.startswith(_path):
             namespace = filename.replace(_path, _replace_with)
             namespace = re.sub('/', '\\\\', namespace)
             return namespace.strip("\\").replace('\\\\', '\\')
 
     for _replace_with, _path in data['autoload-dev']['psr-4'].items():
+		_path = normalize_to_system_style_path(_path)
         if _path.startswith('./'):
-            _path = _path[2:]     
+            _path = _path[2:]
 
         if filename.startswith(_path):
             namespace = filename.replace(_path, _replace_with)