Merge branch 'fix-file-paths' into dev

Conflicts:
	README.md
	plugin/python/vdebug/event.py
	plugin/python/vdebug/runner.py
	plugin/python/vdebug/ui/vimui.py
	plugin/python/vdebug/util.py
	plugin/vdebug.vim

Author: joonty

plugin/python/vdebug/event.py

@@ -141,7 +141,7 @@ def execute(self,runner):
         filename_pos = line.find(" @ ") + 3
         file_and_line = line[filename_pos:]
         line_pos = file_and_line.rfind(":")
-        file = vdebug.util.FilePath(file_and_line[:line_pos])
+        file = vdebug.util.LocalFilePath(file_and_line[:line_pos])
         lineno = file_and_line[line_pos+1:]
         runner.ui.sourcewin.set_file(file)
         runner.ui.sourcewin.set_line(lineno)

plugin/python/vdebug/runner.py

@@ -113,7 +113,7 @@ def refresh(self,status):
                 stack_res = self.update_stack()
                 stack = stack_res.get_stack()
 
-                self.cur_file = vdebug.util.FilePath(stack[0].get('filename'))
+                self.cur_file = vdebug.util.RemoteFilePath(stack[0].get('filename'))
                 self.cur_lineno = stack[0].get('lineno')
 
                 vdebug.log.Log("Moving to current position in source window")

plugin/python/vdebug/ui/vimui.py

@@ -100,7 +100,7 @@ def set_listener_details(self,addr,port,idekey):
         self.statuswin.insert(details,1,True)
 
     def get_current_file(self):
-        return vdebug.util.FilePath(vim.current.buffer.name)
+        return vdebug.util.LocalFilePath(vim.current.buffer.name)
 
     def get_current_row(self):
         return vim.current.window.cursor[0]
@@ -238,7 +238,7 @@ def set_line(self,lineno):
 
     def get_file(self):
         self.focus()
-        self.file = vdebug.util.FilePath(vim.eval("expand('%:p')"))
+        self.file = vdebug.util.LocalFilePath(vim.eval("expand('%:p')"))
         return self.file
 
     def clear_signs(self):
@@ -482,7 +482,7 @@ def render(self):
         string = ""
         for s in stack:
             where = s.get('where') if s.get('where') else 'main'
-            file = vdebug.util.FilePath(s.get('filename'))
+            file = vdebug.util.LocalFilePath(s.get('filename'))
             line = "[%(num)s] %(where)s @ %(file)s:%(line)s" \
                     %{'num':s.get('level'),'where':where,\
                     'file':str(file),'line':s.get('lineno')}

plugin/python/vdebug/util.py

@@ -164,6 +164,22 @@ def __str__(self):
     def __repr__(self):
         return str(self)
 
+class LocalFilePath(FilePath):
+    def _create_local(self,f):
+        """Create the file name as a locally valid version.
+
+        Uses the "local_path" and "remote_path" options.
+        """
+        return f
+
+class RemoteFilePath(FilePath):
+    def _create_remote(self,f):
+        """Create the file name valid for the remote server.
+
+        Uses the "local_path" and "remote_path" options.
+        """
+        return f
+
 class FilePathError(Exception):
     pass
 

plugin/vdebug.vim

@@ -151,6 +151,7 @@ function! vdebug:get_visual_selection()
   let lines[0] = lines[0][col1 - 1:]
   return join(lines, "\n")
 endfunction
+<<<<<<< HEAD
 
 function vdebug:edit(filename)
     try
@@ -159,3 +160,5 @@ function vdebug:edit(filename)
         execute 'silent edit' fnameescape(a:filename)
     endtry
 endfunction
+=======
+>>>>>>> fix-file-paths