Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: Nicolas Setton <setton@adacore.com>

Author: ogorodnik

share/plug-ins/explorer.py

@@ -1,14 +1,14 @@
-"""Contextual menu for Explorer
+"""Contextual menu: 'Open in system file explorer'
 
-This script provides a contextual menu for
-file or directory to open
-explorer in this directory.
+This plugin adds a contextual menu on files and directories in
+the Project View and File View, to reveal the object in the system
+file explorer.
 
 """
 
 import os
+import sys
 import GPS
-import os_utils
 from gs_utils import interactive
 import subprocess
 
@@ -21,17 +21,17 @@ def can_execute(context):
 
 
 @interactive(
-    name="Locate in Explorer",
+    name="Open in system file explorer",
     contextual="Open explorer",
     filter=can_execute
 )
 def on_activate():
     gps = os.environ.copy()
-    sys = os.environ.copy()
+    restored = os.environ.copy()
     for k in gps.keys():
         if k.startswith("GPS_STARTUP_"):
             if gps[k] != "_ABSENT_VARIABLE_":
-                sys[k[12:]] = gps[k]
+                restored[k[12:]] = gps[k]
 
     path = GPS.current_context().directory()
 
@@ -41,13 +41,13 @@ def on_activate():
         else:
             path = '.'
 
-    if os.name == "nt":
+    if sys.platform == "win32":
         e = 'explorer.exe'
         path = '"' + path + '"'
     else:
         e = 'xdg-open'
 
     try:
-        subprocess.call([e, path], env=sys)
+        subprocess.run([e, path], env=restored)
     except Exception as ex:
-        GPS.Console().write(print (ex))
+        GPS.Console().write(str(ex))

testsuite/tests/gs.530_open_explorer/default.gpr

@@ -0,0 +1,10 @@
+project Default is
+
+   package Compiler is
+      for Switches ("Ada") use ("-g", "-O2");
+   end Compiler;
+
+   for Main use ("main.adb");
+
+end Default;
+

testsuite/tests/gs.530_open_explorer/main.adb

@@ -0,0 +1,23 @@
+with Ada.Text_IO;
+
+procedure Main is
+
+   procedure P1;
+   procedure P2;
+
+   procedure P1 is
+      Var : Boolean := False;
+   begin
+      P2;
+   end P1;
+
+   procedure P2 is
+      Var : Boolean := True;
+   begin
+      Ada.Text_IO.Put_Line ("Hello");
+   end P2;
+
+
+begin
+   P1;
+end Main;

testsuite/tests/gs.530_open_explorer/test.cmd

@@ -0,0 +1,7 @@
+if [ "$OS" != "Windows_NT" ]; then
+   export PATH=`pwd`:$PATH
+   echo `pwd`/ > home.txt
+   $GPS -Pdefault --load=python:test.py
+   diff -u home.txt args.txt
+fi
+

testsuite/tests/gs.530_open_explorer/test.py

@@ -0,0 +1,21 @@
+import GPS
+from gs_utils.internal.utils import *
+
+"""
+Verify that 'Open in system file explorer' action
+works.
+
+"""
+
+
+@run_test_driver
+def test_driver():
+    prj_view = Project_View()
+    yield prj_view.open_and_yield()
+    explorer = get_widget_by_name("Project Explorer Tree")
+    explorer.expand_row(Gtk.TreePath((0, 0)), True)
+    prj_view.select_by_name(column=1, value="main.adb")
+    yield wait_idle()
+    GPS.execute_action("Open in system file explorer")
+    yield wait_idle()
+

testsuite/tests/gs.530_open_explorer/test.yaml

@@ -0,0 +1 @@
+title: 'gs.530_open_explorer'

testsuite/tests/gs.530_open_explorer/xdg-open

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "$1" > args.txt
+