Przeglądaj źródła

Fix broken VAPI reading

clanker 1 miesiąc temu
rodzic
commit
1c32942321

+ 1 - 1
README.md

@@ -149,7 +149,7 @@ Valaq automatically searches for VAPI files in standard directories:
 
 - Primary: `/usr/share/vala-0.56/vapi`
 - Secondary: `/usr/share/vala/vapi`
-- Fallbacks: `/usr/share/vala-0.54/vapi`, `/usr/share/vala-0.52/vapi`, `/usr/local/share/vala/vapi`
+- Fallbacks: `/usr/share/vala-0.54/vapi`, `/usr/share/vala/vapi`
 
 Run `valaq` with no arguments to see all available VAPI files.
 

+ 1 - 1
man/valaq.1

@@ -119,7 +119,7 @@ Primary: \fI/usr/share/vala-0.56/vapi\fR
 .IP \(bu 2
 Secondary: \fI/usr/share/vala/vapi\fR
 .IP \(bu 2
-Fallbacks: \fI/usr/share/vala-0.54/vapi\fR, \fI/usr/share/vala-0.52/vapi\fR, \fI/usr/local/share/vala/vapi\fR
+Fallbacks: \fI/usr/share/vala-0.54/vapi\fR, \fI/usr/share/vala/vapi\fR
 .RE
 
 Run 'valaq' with no arguments to see all available VAPI files.

+ 1 - 2
src/cli/argument-parser.vala

@@ -285,8 +285,7 @@ public class ArgumentParser : Object {
         print ("    Valaq automatically searches for VAPI files in standard directories:\n");
         print ("    - Primary: /usr/share/vala-0.56/vapi\n");
         print ("    - Secondary: /usr/share/vala/vapi\n");
-        print ("    - Fallbacks: /usr/share/vala-0.54/vapi, /usr/share/vala-0.52/vapi,\n");
-        print ("                 /usr/local/share/vala/vapi\n");
+        print ("    - Fallbacks: /usr/share/vala-0.54/vapi, /usr/share/vala/vapi\n");
         print ("    Run 'valaq' with no arguments to see all available VAPI files.\n\n");
         print ("EXAMPLES:\n");
         print ("    # List all available VAPI files\n");

+ 2 - 2
src/core/vapi-parser.vala

@@ -63,7 +63,7 @@ public class VapiParser : Object {
         
         // Set the library path for VAPI files
         // These are standard locations where Vala VAPI files are installed
-        context.vapi_directories = { "/usr/share/vala-0.56/vapi", "/usr/local/share/vala-0.56/vapi" };
+        context.vapi_directories = { "/usr/share/vala-0.56/vapi", "/usr/share/vala/vapi" };
     }
     
     /**
@@ -90,7 +90,7 @@ public class VapiParser : Object {
             
             // Create a source file for the VAPI file
             // Use SOURCE type instead of PACKAGE to ensure it's parsed
-            var source_file = new Vala.SourceFile (context, Vala.SourceFileType.SOURCE, path);
+            var source_file = new Vala.SourceFile (context, Vala.SourceFileType.PACKAGE, path);
             context.add_source_file (source_file);
             
             

+ 1 - 2
src/utils/file-utils.vala

@@ -49,8 +49,7 @@ public class FileUtils : Object {
         // Additional fallback paths (for backward compatibility)
         string[] fallback_paths = {
             "/usr/share/vala-0.54/vapi",
-            "/usr/share/vala-0.52/vapi",
-            "/usr/local/share/vala/vapi"
+            "/usr/share/vala/vapi",
         };
         
         foreach (string path in fallback_paths) {