Move ModifierFlags to its own file; this is necessary to avoid recu…

…rsive dependency import issues, when using the enum as a value.

server/src/UC/SymbolTagsBuilderVisitor.ts

@@ -1,6 +1,7 @@
 import { SymbolTag } from 'vscode-languageserver';
 
-import { ModifierFlags, UCClassSymbol, UCFieldSymbol, UCMethodSymbol, UCPropertySymbol } from './Symbols';
+import { UCClassSymbol, UCFieldSymbol, UCMethodSymbol, UCPropertySymbol } from './Symbols';
+import { ModifierFlags } from './Symbols/ModifierFlags';
 import { DumbSymbolWalker } from './symbolWalker';
 
 // Transform field modifiers to their corresponding SymbolTag counter-part.

server/src/UC/Symbols/ArchetypeSymbol.ts

@@ -1,15 +1,15 @@
-import { UCDocument } from 'UC/document';
+import { UCDocument } from '../document';
 import { Name } from '../name';
 import { SymbolWalker } from '../symbolWalker';
 import {
-    ModifierFlags,
     UCClassSymbol,
     UCFieldSymbol,
     UCObjectSymbol,
     UCStructSymbol,
     UCSymbolKind,
     UCTypeKind,
 } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 /**
  * Represents an instanced Archetype found within a defaultproperties block e.g. "begin object class=classID name=objectName".

server/src/UC/Symbols/ArrayOperations.ts

@@ -3,13 +3,13 @@ import { toName } from '../name';
 import { NAME_ARRAY } from '../names';
 import {
     DEFAULT_RANGE,
-    ModifierFlags,
     StaticIntType,
     StaticMetaType,
     UCMethodLikeSymbol,
     UCParamSymbol,
     UCStructSymbol,
 } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 /** (defaultproperties) Acts as a template for array operations such as MyArray.Replace(item1, item2) etc.  */
 export const DefaultArray = new UCStructSymbol({ name: NAME_ARRAY, range: DEFAULT_RANGE }, DEFAULT_RANGE);

server/src/UC/Symbols/ClassSymbol.ts

@@ -6,7 +6,6 @@ import { SymbolWalker } from '../symbolWalker';
 import {
     ISymbol,
     ITypeSymbol,
-    ModifierFlags,
     UCArchetypeSymbol,
     UCFieldSymbol,
     UCObjectTypeSymbol,
@@ -16,6 +15,7 @@ import {
     UCSymbolKind,
     UCTypeKind,
 } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export enum ClassModifierFlags {
     None,

server/src/UC/Symbols/ConstSymbol.ts

@@ -3,7 +3,8 @@ import { Position } from 'vscode-languageserver-types';
 import { UCDocument } from '../document';
 import { IExpression } from '../expressions';
 import { SymbolWalker } from '../symbolWalker';
-import { ModifierFlags, UCFieldSymbol, UCStructSymbol, UCSymbolKind, UCTypeKind } from './';
+import { UCFieldSymbol, UCStructSymbol, UCSymbolKind, UCTypeKind } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export class UCConstSymbol extends UCFieldSymbol {
     override kind = UCSymbolKind.Const;

server/src/UC/Symbols/CoreSymbols.ts

@@ -36,7 +36,6 @@ import {
 } from '../names';
 import {
     DEFAULT_RANGE,
-    ModifierFlags,
     StaticIntType,
     StaticNameType,
     StaticObjectType,
@@ -49,6 +48,7 @@ import {
     addHashedSymbol,
     getSymbolOuterHash,
 } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export const CORE_PACKAGE = new UCPackage(NAME_CORE);
 

server/src/UC/Symbols/DefaultPropertiesBlock.ts

@@ -3,8 +3,9 @@ import { SymbolWalker } from '../symbolWalker';
 import {
     ContextKind,
     getContext,
-    isArchetypeSymbol, ISymbol, ModifierFlags, UCClassSymbol, UCStructSymbol, UCSymbolKind
+    isArchetypeSymbol, ISymbol, UCClassSymbol, UCStructSymbol, UCSymbolKind
 } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export class UCDefaultPropertiesBlock extends UCStructSymbol {
     override kind = UCSymbolKind.DefaultPropertiesBlock;

server/src/UC/Symbols/EnumMemberSymbol.ts

@@ -1,5 +1,6 @@
 import { SymbolWalker } from '../symbolWalker';
-import { ModifierFlags, UCFieldSymbol, UCSymbolKind, UCTypeKind } from './';
+import { UCFieldSymbol, UCSymbolKind, UCTypeKind } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export class UCEnumMemberSymbol extends UCFieldSymbol {
     override kind = UCSymbolKind.EnumTag;
@@ -34,4 +35,4 @@ export class UCEnumMemberSymbol extends UCFieldSymbol {
 	override accept<Result>(visitor: SymbolWalker<Result>): Result | void {
 		return visitor.visitEnumMember(this);
 	}
-}
+}

server/src/UC/Symbols/FieldSymbol.ts

@@ -3,97 +3,8 @@ import { Position } from 'vscode-languageserver-types';
 import { UCDocument } from '../document';
 import { config, indexDeclarationReference } from '../indexer';
 import { UCGeneration } from '../settings';
-import { ISymbol, ITypeSymbol, UCObjectSymbol, UCStructSymbol, isParamSymbol } from './';
-
-export enum ModifierFlags {
-	None 				= 0x0000,
-
-    // FieldFlags
-
-    /** The field is marked as 'protected' */
-	Protected 			= 1 << 0,
-
-    /** The field is marked as 'private' */
-	Private 			= 1 << 1,
-
-	NotPublic 			= Protected | Private,
-
-    /** The field is marked as 'native' or 'intrinsic' */
-	Native 				= 1 << 2,
-
-    /** The field is marked as 'const' or treated as readonly (for intrinsics) */
-	ReadOnly 			= 1 << 3, // aka Const
-
-    /** The field has a specified element size. e.g. `var int MyVar[2];` */
-	WithDimension		= 1 << 4, // A multiple dimension property
-
-    /** The field is marked as 'transient' */
-    Transient           = 1 << 6,
-
-    // ParamFlags
-
-    /** The field is a parameter of a function. */
-    Param               = 1 << 7,
-
-    /** The field is a return parameter (generated) of a function. */
-	ReturnParam			= 1 << 8,
-
-    /** The field is marked as 'out' */
-	Out 			    = 1 << 9,
-
-    /** The field is marked as 'optional' */
-	Optional		    = 1 << 10,
-
-    /** The field is marked as 'init' */
-	Init 			    = 1 << 11, // NOT SUPPORTED
-
-    /** The field is marked as 'skip' */
-	Skip			    = 1 << 12, // NOT SUPPORTED
-
-    /** The field is marked as 'coerce' */
-	Coerce			    = 1 << 13,
-
-    // XCom
-
-    /** The field is marked as 'ref' */
-	Ref				    = 1 << 14, // NOT SUPPORTED
-
-    // LocalFlags
-
-    /** The field is a local field of a function or state. */
-    Local	            = 1 << 15,
-
-    // ClassFlags
-
-    /** The field is marked as 'abstract' */
-    Abstract            = 1 << 16, // TODO: Unify with ClassModifiers?
-
-    // InternalFlags
-    /**
-     * Field is an intrisic symbol, not to be confused with the older 'intrinsic' native keyword.
-     * That means the symbol was not contructed from an UnrealScript counter part or is not designed in a way that it ever could be.
-     * For instance:
-     *  - 'ArrayIterator' an iterator function symbol to deal with a `foreach` loop on a dynamic array.
-     *  - 'IntrinsicVectLiteral' a function to represent a `vect(...)` literal.
-     *  - 'Core.Class' a class with no UnrealScript counter part (a Class.uc file)
-     **/
-    Intrinsic           = 1 << 17,
-
-    /** The field is a generated symbol, such as the return type of a function. */
-    Generated           = 1 << 18,
-
-    /** The field is a keyword symbol, such as `Vect` */
-    Keyword             = 1 << 19,
-
-    /** The field should not index a declaration reference. */
-    NoDeclaration       = 1 << 20,
-
-    /** The field is marked as 'deprecated' */
-    Deprecated          = 1 << 21,
-
-    // A private method can however be re-defined!
-    NonOverridable      = Private | Intrinsic,
-}
+import { ITypeSymbol, UCObjectSymbol, UCStructSymbol, isParamSymbol } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export abstract class UCFieldSymbol extends UCObjectSymbol {
     declare outer: UCObjectSymbol;

server/src/UC/Symbols/InterfaceSymbol.ts

@@ -1,5 +1,6 @@
 import { SymbolWalker } from '../symbolWalker';
-import { ClassModifierFlags, ModifierFlags, UCClassSymbol, UCSymbolKind, UCTypeKind } from './';
+import { ClassModifierFlags, UCClassSymbol, UCSymbolKind, UCTypeKind } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export class UCInterfaceSymbol extends UCClassSymbol {
     static override readonly allowedKindsMask = 1 << UCSymbolKind.Enum

server/src/UC/Symbols/IntrinsicArrayIterator.ts

@@ -1,13 +1,13 @@
 import {
     DEFAULT_RANGE,
     MethodFlags,
-    ModifierFlags,
     StaticIntType,
     StaticMetaType,
     UCMethodLikeSymbol,
     UCParamSymbol,
 } from '.';
 import { toName } from '../name';
+import { ModifierFlags } from './ModifierFlags';
 
 export const ArrayIterator = new UCMethodLikeSymbol(toName('Iterator'));
 ArrayIterator.modifiers |= ModifierFlags.Intrinsic | ModifierFlags.ReadOnly | ModifierFlags.NoDeclaration;

server/src/UC/Symbols/IntrinsicSymbols.ts

@@ -3,7 +3,6 @@ import { toName } from '../name';
 import { NAME_ARRAY, NAME_RETURNVALUE } from '../names';
 import {
     DEFAULT_RANGE,
-    ModifierFlags,
     StaticDelegateType,
     StaticFloatType,
     StaticIntType,
@@ -21,6 +20,7 @@ import {
     UCStructSymbol,
     UCSymbolKind,
 } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export * from './CoreSymbols';
 export * from './EngineSymbols';
@@ -163,15 +163,15 @@ IntrinsicNewConstructor.kind = UCSymbolKind.Operator;
 IntrinsicNewConstructor.modifiers |= ModifierFlags.Keyword;
 IntrinsicNewConstructor.description = createToken(`
     Creates a new instanced object of the specified class.
-    
+
     Syntax:
     ${'`new [( [outer [, name [, flags]]] )] class [( template )]`'}
 
     Usage:
     ${'```unrealscript'}
     ${`new (None, "MyObject", RF_Transient) Class'MyClass' (MyClass'MyTemplateObject')`}
     ${'```'}
-    
+
     ${'For *Unreal Engine 2* the event `Object.Created()` will be instigated during the construction.'}
 `);
 

server/src/UC/Symbols/LocalSymbol.ts

@@ -1,5 +1,6 @@
 import { SymbolWalker } from '../symbolWalker';
-import { ModifierFlags, UCPropertySymbol, UCSymbolKind } from './';
+import { UCPropertySymbol, UCSymbolKind } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export class UCLocalSymbol extends UCPropertySymbol {
     override kind = UCSymbolKind.Local;
@@ -16,4 +17,4 @@ export class UCLocalSymbol extends UCPropertySymbol {
 	override accept<Result>(visitor: SymbolWalker<Result>): Result | void {
 		return visitor.visitLocal(this);
 	}
-}
+}

server/src/UC/Symbols/MethodSymbol.ts

@@ -4,14 +4,13 @@ import { Token } from 'antlr4ts/Token';
 import { UCDocument } from '../document';
 import { config } from '../indexer';
 import { Name } from '../name';
-import { NAME_ACTOR, NAME_CREATEDATAOBJECT, NAME_ENGINE, NAME_LOADDATAOBJECT, NAME_SPAWN } from '../names';
+import { NAME_CREATEDATAOBJECT, NAME_LOADDATAOBJECT, NAME_SPAWN } from '../names';
 import { UCGeneration } from '../settings';
 import { SymbolWalker } from '../symbolWalker';
 import {
     ContextKind,
     DEFAULT_RANGE,
     ISymbol,
-    ModifierFlags,
     SymbolReferenceFlags,
     UCFieldSymbol,
     UCObjectSymbol,
@@ -21,6 +20,7 @@ import {
     UCTypeKind,
     isFunction,
 } from './';
+import { ModifierFlags } from './ModifierFlags';
 
 export enum MethodFlags {
     None = 0x0000,

server/src/UC/Symbols/ModifierFlags.ts

@@ -0,0 +1,89 @@
+/**
+ * An all in one set of flags for UProperty kinds.
+ *
+ * Some flags are shared with @see MethodFlags and @see ClassModifiers.
+ */
+export const enum ModifierFlags {
+    None = 0,
+
+    // FieldFlags
+    /** The field is marked as 'protected' */
+    Protected = 1 << 0,
+
+    /** The field is marked as 'private' */
+    Private = 1 << 1,
+
+    NotPublic = Protected | Private,
+
+    /** The field is marked as 'native' or 'intrinsic' */
+    Native = 1 << 2,
+
+    /** The field is marked as 'const' or treated as readonly (for intrinsics) */
+    ReadOnly = 1 << 3, // aka Const
+
+    /** The field has a specified element size. e.g. `var int MyVar[2];` */
+    WithDimension = 1 << 4, // A multiple dimension property
+
+    /** The field is marked as 'transient' */
+    Transient = 1 << 6,
+
+    // ParamFlags
+    /** The field is a parameter of a function. */
+    Param = 1 << 7,
+
+    /** The field is a return parameter (generated) of a function. */
+    ReturnParam = 1 << 8,
+
+    /** The field is marked as 'out' */
+    Out = 1 << 9,
+
+    /** The field is marked as 'optional' */
+    Optional = 1 << 10,
+
+    /** The field is marked as 'init' */
+    Init = 1 << 11, // NOT SUPPORTED
+
+    /** The field is marked as 'skip' */
+    Skip = 1 << 12, // NOT SUPPORTED
+
+    /** The field is marked as 'coerce' */
+    Coerce = 1 << 13,
+
+    // XCom
+    /** The field is marked as 'ref' */
+    Ref = 1 << 14, // NOT SUPPORTED
+
+    // LocalFlags
+    /** The field is a local field of a function or state. */
+    Local = 1 << 15,
+
+    // ClassFlags
+    /** The field is marked as 'abstract' */
+    Abstract = 1 << 16, // TODO: Unify with ClassModifiers?
+
+    // InternalFlags
+    /**
+     * Field is an intrisic symbol, not to be confused with the older 'intrinsic' native keyword.
+     * That means the symbol was not contructed from an UnrealScript counter part or is not designed in a way that it ever could be.
+     * For instance:
+     *  - 'ArrayIterator' an iterator function symbol to deal with a `foreach` loop on a dynamic array.
+     *  - 'IntrinsicVectLiteral' a function to represent a `vect(...)` literal.
+     *  - 'Core.Class' a class with no UnrealScript counter part (a Class.uc file)
+     **/
+    Intrinsic = 1 << 17,
+
+    /** The field is a generated symbol, such as the return type of a function. */
+    Generated = 1 << 18,
+
+    /** The field is a keyword symbol, such as `Vect` */
+    Keyword = 1 << 19,
+
+    /** The field should not index a declaration reference. */
+    NoDeclaration = 1 << 20,
+
+    /** The field is marked as 'deprecated' */
+    Deprecated = 1 << 21,
+
+    // A private method can however be re-defined!
+    NonOverridable = Private | Intrinsic,
+}