Finish pre-release-0.6.2

EliotVU · Feb 9, 2023 · 42f5902 · 42f5902 · Shtoyan · Feb 9, 2023
2 parents 525e14e + f6e5f29
commit 42f5902
Show file tree

Hide file tree

Showing 66 changed files with 2,294 additions and 1,284 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -5,6 +5,7 @@
         "eliotvu.uc",
         "pedro-w.tmlanguage",
         "amodio.tsl-problem-matcher",
-        "rbbit.typescript-hero"
+        "rbbit.typescript-hero",
+        "nicoespeon.abracadabra"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,22 +1,31 @@
 {
     "typescript.preferences.quoteStyle": "single",
+    "typescriptHero.imports.organizeOnSave": true,
     "antlr4.generation": {
         "language": "TypeScript",
         "outputDir": "grammars"
     },
     "mochaExplorer.nodePath": null,
     "mochaExplorer.cwd": "server",
     "mochaExplorer.mochaPath": "server/node_modules/mocha",
-    "mochaExplorer.require": "ts-node/register",
-    "mochaExplorer.files": "**/*.test.ts",
+    "mochaExplorer.require": "node_modules/ts-node/register",
+    "mochaExplorer.files": "server/**/*.test.ts",
+    "mochaExplorer.ignore": "server/node_modules/**/*.test.ts",
+    // "mochaExplorer.launcherScript": "node_modules/mocha-explorer-launcher-scripts/vscode-test",
+    "mochaExplorer.autoload": false,
+    "mochaExplorer.esmLoader": false,
+    // "mochaExplorer.ipcRole": "server",
     "mochaExplorer.env": {
         "TS_NODE_COMPILER_OPTIONS": "{\"module\":\"commonjs\",\"strict\":false}",
+        // "VSCODE_VERSION": "insiders",
+        "ELECTRON_RUN_AS_NODE": null
     },
+    "mochaExplorer.globImplementation": "vscode",
+    // "mochaExplorer.logpanel": true,
     "cSpell.words": [
         "antlr",
         "diagnoser",
         "Intrinsics",
         "Vect"
     ],
-    "typescriptHero.imports.organizeOnSave": true,
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # UnrealScript Language Service
 
+## 0.6.2 (Feb 9, 2023)
+
+- Implemented an option to enable auto-detection of the UnrealScript language generation that's being used by the workspace.
+- Implemented a new code-action to inline a constant's evaluated value.
+
+- Quality of Life
+  - General improvements to how indexing of documents is handled.
+  - Fixed parser support for string types that have a fixed size e.g. ```String[255]``` (UE1).
+  - Fixed type ```Pointer``` will be no longer recognized if the language is set to generation 3 (this has been displaced by the Core.Object.Pointer struct).
+  - Fixed [No symbols found](https://github.com/EliotVU/UnrealScript-Language-Service/issues/157)
+
+- Known Issues:
+  - 
+
+## 0.6.1 (Jan 29, 2023)
+
+- The service will now register .u/.upk (the extensions are configurable) files as known package symbols, this means such packages will be included in the auto-completion and indexing of references.
+  - Note: The contents of the packages are not yet indexed.
+
+- Implemented [Auto-insert when overriding a function](https://github.com/EliotVU/UnrealScript-Language-Service/issues/153).
+- Further improvements have been made to the auto-completion suggestions.
+
 ## 0.6.0 (Jan 26, 2023)
 
 - Implemented [LSP Semantic-Tokens #137](https://github.com/EliotVU/UnrealScript-Language-Service/issues/137) (References to a class will now be highlighted as such even where the tmLanguage cannot determine the identifier's type)
@@ -8,26 +30,26 @@
 - Implemented [LSP Workspace Symbols #148](https://github.com/EliotVU/UnrealScript-Language-Service/issues/148)
   - ![image](./docs/media/workspaceSymbols.png)
 
-- Added [UnrealScript snippets #149](https://github.com/EliotVU/UnrealScript-Language-Service/issues/149)
+- Added [UnrealScript snippets #149](https://github.com/EliotVU/UnrealScript-Language-Service/issues/149).
 
 - Typing, major improvements have been made to the type-checking system, there are almost no false-positive errors anymore!
-- Archetypes, overall better support for "begin object" constructions
-- Better and more responsive auto-completion suggestions
+- Archetypes, overall better support for "begin object" constructions.
+- Better and more responsive auto-completion suggestions.
 
 - Quality of Life
-  - Overall improvements have been made to UnrealScript parsing
-  - Overall improvements to UnrealScript syntax highlighting
-  - Fixed [(DefaultProperties) Issue with structs written on multiple lines](https://github.com/EliotVU/UnrealScript-Language-Service/issues/138)
-  - Fixed an issue where a Function call in a member context ```Outer.SomeIdentifier(...)``` could mismatch a Class's name
-  - Partially fixed an issue (in some cases) where a Function/Class invocation could be mistaken for one another
-  - Fixed LSP/documentSymbol [VSCode's Sticky scroll feature](https://github.com/EliotVU/UnrealScript-Language-Service/issues/148)
+  - Overall improvements have been made to UnrealScript parsing.
+  - Overall improvements to UnrealScript syntax highlighting.
+  - Fixed [(DefaultProperties) Issue with structs written on multiple lines](https://github.com/EliotVU/UnrealScript-Language-Service/issues/138).
+  - Fixed an issue where a Function call in a member context ```Outer.SomeIdentifier(...)``` could mismatch a Class's name.
+  - Partially fixed an issue (in some cases) where a Function/Class invocation could be mistaken for one another.
+  - Fixed LSP/documentSymbol [VSCode's Sticky scroll feature](https://github.com/EliotVU/UnrealScript-Language-Service/issues/148).
   - Fixed an issue that caused the document transformer to abort when trying to build a property with bad type-grammar (actually usually triggered by use of  macros).
 
 ## 0.5.0 (Nov 8, 2021)
 
 - Autocomplete and IntelliSense
-  - Has been displaced with the help of a third-party library [c3](https://github.com/mike-lischke/antlr4-c3)
-  - This switch has made it much easier to implement context-aware autocompletes, but more work will be needed to bring it the quality that we all take for granted in popular languages :)
+  - Has been displaced with the help of a third-party library [c3](https://github.com/mike-lischke/antlr4-c3).
+  - This switch has made it much easier to implement context-aware autocompletes, but more work will be needed to bring it the quality that we all take for granted in popular languages.
 
 - Added the first CodeAction
   - If a type is missing where a class type is expected, the service will now suggest to generate the class for you.
@@ -63,10 +85,10 @@
     This option tells the service which UnrealScript edition it should optimize for.
 
 - Quality of Life
-  - Fixed [Closing unopened comment](https://github.com/EliotVU/UnrealScript-Language-Service/issues/28)
-  - Fixed ["default:" is not highlighted](https://github.com/EliotVU/UnrealScript-Language-Service/issues/22)
-  - Fixed ["Spawn" return type is not coerced to its first parameter's type. #21](https://github.com/EliotVU/UnrealScript-Language-Service/issues/21)
-  - Fixed ["no viable alternative at input 'return A -='"](https://github.com/EliotVU/UnrealScript-Language-Service/issues/20)
-  - Fixed [Highlighting issue regarding a comment if on the same line as a struct declaration #19](https://github.com/EliotVU/UnrealScript-Language-Service/issues/19)
-  - Fixed [Class and package name confusion](https://github.com/EliotVU/UnrealScript-Language-Service/issues/15)
-  - Fixed ["const ref" argument confusing the parser](https://github.com/EliotVU/UnrealScript-Language-Service/issues/14)
+  - Fixed [Closing unopened comment](https://github.com/EliotVU/UnrealScript-Language-Service/issues/28).
+  - Fixed ["default:" is not highlighted](https://github.com/EliotVU/UnrealScript-Language-Service/issues/22).
+  - Fixed ["Spawn" return type is not coerced to its first parameter's type. #21](https://github.com/EliotVU/UnrealScript-Language-Service/issues/21).
+  - Fixed ["no viable alternative at input 'return A -='"](https://github.com/EliotVU/UnrealScript-Language-Service/issues/20).
+  - Fixed [Highlighting issue regarding a comment if on the same line as a struct declaration #19](https://github.com/EliotVU/UnrealScript-Language-Service/issues/19).
+  - Fixed [Class and package name confusion](https://github.com/EliotVU/UnrealScript-Language-Service/issues/15).
+  - Fixed ["const ref" argument confusing the parser](https://github.com/EliotVU/UnrealScript-Language-Service/issues/14).
diff --git a/grammars/UCParser.g4 b/grammars/UCParser.g4
@@ -542,19 +542,13 @@ variableModifier
 	| ('privatewrite' exportBlockText?)
 	;
 
-primitiveType
-	: 'byte'
-	| 'int'
-	| 'float'
-	| 'bool'
-	| 'string'
-	| 'name'
-	| 'pointer'
-	| 'button' // alias for a string with an input modifier
+varType
+	: variableModifier* typeDecl
 	;
 
 typeDecl
 	: primitiveType
+    | stringType
 	| classType
 	| arrayType
 	| delegateType
@@ -564,10 +558,20 @@ typeDecl
 	| qualifiedIdentifier
 	;
 
-varType
-	: variableModifier* typeDecl
+primitiveType
+	: 'byte'
+	| 'int'
+	| 'float'
+	| 'bool'
+	| 'name'
+	| 'pointer'
+	| 'button' // alias for a string with an input modifier
 	;
 
+stringType
+    : 'string' (OPEN_BRACKET INTEGER_LITERAL CLOSE_BRACKET)?
+    ;
+
 // Note: inlinedDeclTypes includes another arrayGeneric!
 arrayType
 	: 'array' (LT varType GT)
@@ -738,7 +742,7 @@ codeBlockOptional
 	;
 
 statement
-	: SEMICOLON
+	: emptyStatement
 	| ifStatement
 	| forStatement
 	| foreachStatement
@@ -762,6 +766,8 @@ statement
 	| directive
 	;
 
+emptyStatement: SEMICOLON;
+
 assignmentStatement: expr=assignmentExpression SEMICOLON;
 expressionStatement: expr=primaryExpression SEMICOLON;
 

diff --git a/grammars/test/Grammar.uc b/grammars/test/Grammar.uc
@@ -0,0 +1,41 @@
+class Grammar;
+
+const C1 = 0;
+
+enum E1 {
+    E1_1,
+    E1_2,
+};
+
+struct S1 {
+    struct S2 {
+        var int V1;
+    };
+
+    var enum E2 {
+        E2_1
+    } V2;
+
+    var int V3;
+};
+
+var int V4;
+
+delegate D1();
+
+function F1();
+
+state ST1
+{
+    ignores F1;
+
+    function F2();
+
+begin:
+    F2();
+}
+
+defaultproperties
+{
+    V4=1
+}
diff --git a/grammars/examples/macro.uci → grammars/test/Macro.uci b/grammars/examples/macro.uci → grammars/test/Macro.uci