Merge pull request #39739 from MichaelBelousov/fix/long-enum-fix-ride…

…r-cast fix underlying type of enum crashing cast in RiderPathManager
godotengine · Jun 24, 2020 · 04795d7 · 04795d7
2 parents 8f5005b + 9f61f1e
commit 04795d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/mono/editor/GodotTools/GodotTools/Build/BuildTool.cs b/modules/mono/editor/GodotTools/GodotTools/Build/BuildTool.cs
@@ -1,6 +1,6 @@
 namespace GodotTools.Build
 {
-    public enum BuildTool
+    public enum BuildTool : long
     {
         MsBuildMono,
         MsBuildVs,

diff --git a/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs b/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs
@@ -1,6 +1,6 @@
 namespace GodotTools
 {
-    public enum ExternalEditorId
+    public enum ExternalEditorId : long
     {
         None,
         VisualStudio, // TODO (Windows-only)

diff --git a/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs b/modules/mono/editor/GodotTools/GodotTools/Internals/ScriptClassParser.cs
@@ -13,9 +13,9 @@ public class ClassDecl
             public string Name { get; }
             public string Namespace { get; }
             public bool Nested { get; }
-            public int BaseCount { get; }
+            public long BaseCount { get; }
 
-            public ClassDecl(string name, string @namespace, bool nested, int baseCount)
+            public ClassDecl(string name, string @namespace, bool nested, long baseCount)
             {
                 Name = name;
                 Namespace = @namespace;
@@ -45,7 +45,7 @@ public static Error ParseFile(string filePath, out IEnumerable<ClassDecl> classe
                     (string)classDeclDict["name"],
                     (string)classDeclDict["namespace"],
                     (bool)classDeclDict["nested"],
-                    (int)classDeclDict["base_count"]
+                    (long)classDeclDict["base_count"]
                 ));
             }