Improve support for UE1, highlight class modifier localized, `expan…

…ds` in struct and state, and recognize the `always` keyword in a replication block.
EliotVU · May 28, 2024 · 49f67d4 · 49f67d4
1 parent dce7b15
commit 49f67d4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/grammars/UCLexer.g4 b/grammars/UCLexer.g4
@@ -111,6 +111,7 @@ KW_IF: 'if';
 KW_IGNORES: 'ignores';
 KW_UNRELIABLE: 'unreliable';
 KW_RELIABLE: 'reliable';
+KW_ALWAYS: 'always';
 KW_CPPTEXT: 'cpptext';
 KW_STRUCTCPPTEXT: 'structcpptext';
 KW_CPPSTRUCT: 'cppstruct';

diff --git a/grammars/UCParser.g4 b/grammars/UCParser.g4
@@ -111,6 +111,7 @@ identifier
 	| 'ignores'
 	| 'unreliable'
 	| 'reliable'
+    | 'always'
 	| 'cpptext'
 	| 'cppstruct'
 	| 'structcpptext'
@@ -471,6 +472,7 @@ enumMember
 	;
 
 structDecl
+    // UE1 doesn't support qualified 'expands'
 	:	'struct' ({ this.generation === 3 }? exportBlockText)? structModifier* identifier qualifiedExtendsClause?
 		OPEN_BRACE
 			structMember*
@@ -673,8 +675,11 @@ replicationModifier
 	;
 
 replicationStatement
-	: replicationModifier? 'if' (OPEN_PARENS expr=expression CLOSE_PARENS)
-		identifier (COMMA identifier)* SEMICOLON
+	: replicationModifier?
+        // Unreal 1
+        ({ this.generation === 1 }? 'always')?
+        'if' (OPEN_PARENS expr=expression CLOSE_PARENS)
+		    identifier (COMMA identifier)* SEMICOLON
 	;
 
 /* Parses:

diff --git a/server/src/UC/Symbols/FieldSymbol.ts b/server/src/UC/Symbols/FieldSymbol.ts
@@ -1,8 +1,9 @@
 import { Position } from 'vscode-languageserver-types';
 
 import { UCDocument } from '../document';
-import { indexDeclarationReference } from '../indexer';
+import { config, indexDeclarationReference } from '../indexer';
 import { isParamSymbol, ISymbol, ITypeSymbol, UCObjectSymbol, UCStructSymbol } from './';
+import { UCGeneration } from '../settings';
 
 export enum ModifierFlags {
 	None 				= 0x0000,
@@ -105,7 +106,7 @@ export abstract class UCFieldSymbol extends UCObjectSymbol {
             text.push('protected');
         } else if (modifiers & ModifierFlags.Private) {
             text.push('private');
-        } else {
+        } else if (config.generation !== UCGeneration.UC1) {
             text.push('public');
         }
 

diff --git a/server/src/UC/Symbols/StateSymbol.ts b/server/src/UC/Symbols/StateSymbol.ts
@@ -37,6 +37,14 @@ export class UCStateSymbol extends UCStructSymbol {
 		return 'state';
 	}
 
+    public buildModifiers(modifiers = this.modifiers): string[] {
+		const text: string[] = [];
+
+        // none tracked yet
+
+		return text;
+	}
+
 	override getTooltip(): string {
 		const text: Array<string | undefined> = [];
 

diff --git a/syntaxes/UnrealScript.YAML-tmLanguage b/syntaxes/UnrealScript.YAML-tmLanguage
@@ -474,7 +474,7 @@ repository:
           '3':
             name: entity.name.type.class.uc
 
-      - match: \b((?i)abstract|export|exportstructs|noexport|noexportheader|nativereplication|nativeonly|deprecated|transient|nontransient|nousercreate|notplaceable|placeable|safereplace|parseconfig|hidedropdown|editinlinenew|noteditinlinenew|cacheexempt|perobjectconfig|perobjectlocalized|forcescriptorder|instanced)\b
+      - match: \b((?i)abstract|export|exportstructs|noexport|noexportheader|nativereplication|nativeonly|deprecated|transient|nontransient|nousercreate|notplaceable|placeable|safereplace|parseconfig|hidedropdown|editinlinenew|noteditinlinenew|cacheexempt|perobjectconfig|perobjectlocalized|forcescriptorder|instanced|localized)\b
         name: storage.modifier.uc
 
       # modifiers with optional params
@@ -588,7 +588,7 @@ repository:
       - name: storage.modifier.uc
         match: \b((?i)native|intrinsic|transient|export|strictconfig|atomic|atomicwhencooked|immutable|immutablewhencooked|init|long)\b
 
-      - match: (\w+)\s*(?:((?i)extends)\b\s*(\w+))?
+      - match: (\w+)\s*(?:((?i)extends|expands)\b\s*(\w+))?
         captures:
           '0':
             name: entity.name.type.struct.uc
@@ -874,7 +874,7 @@ repository:
 
   state-declaration:
     name: meta.state.declaration.uc
-    begin: \b((?i)state)\b(\s*\(\s*\))?\s*(\w+)(?:\s*((?i)extends)\s*(\w+))?
+    begin: \b((?i)state)\b(\s*\(\s*\))?\s*(\w+)(?:\s*((?i)extends|expands)\s*(\w+))?
     beginCaptures:
       '1':
         name: storage.type.state.uc
@@ -963,11 +963,13 @@ repository:
             name: punctuation.curlybrace.open.uc
         patterns:
           - include: '#comment'
-          - begin: \b((?i)unreliable|reliable)?\s*((?i)if)?
+          - begin: \b((?i)unreliable|reliable)?\s*((?i)always\s*)?((?i)if)?
             beginCaptures:
               '1':
                 name: keyword.other.modifier.uc
               '2':
+                name: keyword.other.modifier.uc
+              '3':
                 name: keyword.control.conditional.uc
             patterns:
               - include: '#comment'