Skip to content

Commit 9352221

Browse files
committed
Finish Release-0.6.4
2 parents 42f5902 + b9c4765 commit 9352221

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1272
-802
lines changed

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"@typescript-eslint/no-unused-vars": 0,
2424
"@typescript-eslint/no-explicit-any": 0,
2525
"@typescript-eslint/explicit-module-boundary-types": 0,
26-
"@typescript-eslint/no-non-null-assertion": 0
26+
"@typescript-eslint/no-non-null-assertion": 0,
27+
"no-inner-declarations": "off"
2728
}
2829
}

CHANGELOG.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# UnrealScript Language Service
22

3+
## 0.6.4 (Feb 16, 2023)
4+
5+
- Fixed [Class-function field hint](https://github.com/EliotVU/UnrealScript-Language-Service/issues/161).
6+
- Fixed [Type checking error when passing an Enum object to a function as argument](https://github.com/EliotVU/UnrealScript-Language-Service/issues/166).
7+
- Fixed [Enum tag reference in a condition expression produces an error when type checking is enabled](https://github.com/EliotVU/UnrealScript-Language-Service/issues/167).
8+
- Fixed [Request textDocument/documentSymbol failed](https://github.com/EliotVU/UnrealScript-Language-Service/issues/169).
9+
- [Add a new diagnostic for UC3 enum based element dimensions; and fix the misplaced range for array dimension diagnostics.](https://github.com/EliotVU/UnrealScript-Language-Service/commit/97e7b1ec9dbd62ae98c81f473a79f20826f18ac5).
10+
- [Fail auto detection when no Object.uc document is present](https://github.com/EliotVU/UnrealScript-Language-Service/commit/1d64bc3771c5e23fa34f9624962e6567d197e879).
11+
12+
## 0.6.3 (Feb 10, 2023)
13+
14+
- Fixed an issue with skipLine() failing on UnrealScript directives i.e. "#exec obj load ..."
15+
316
## 0.6.2 (Feb 9, 2023)
417

518
- Implemented an option to enable auto-detection of the UnrealScript language generation that's being used by the workspace.
@@ -11,9 +24,6 @@
1124
- 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).
1225
- Fixed [No symbols found](https://github.com/EliotVU/UnrealScript-Language-Service/issues/157)
1326

14-
- Known Issues:
15-
-
16-
1727
## 0.6.1 (Jan 29, 2023)
1828

1929
- 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.

grammars/UCParser.g4

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ options {
1313
let token;
1414
do {
1515
token = this._input.get(i++);
16-
} while (token.type !== UCParser.NEWLINE && token.type !== UCParser.EOF)
16+
// We cannot consume an EOF token.
17+
if (token.type === UCParser.EOF) {
18+
break;
19+
}
20+
// We need to consume, incase the stream is not filled yet.
21+
this._input.consume();
22+
} while (token.type !== UCParser.NEWLINE)
1723
this._input.seek(i);
1824
}
1925

grammars/test/Grammar.uc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
class Grammar;
22

3+
#exec obj load package=filepath
4+
35
const C1 = 0;
46

57
enum E1 {

package-lock.json

Lines changed: 91 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "uc",
33
"description": "UnrealScript Language support",
44
"displayName": "UnrealScript",
5-
"version": "0.6.2",
5+
"version": "0.6.4",
66
"author": {
77
"name": "Eliot van Uytfanghe",
88
"url": "https://EliotVU.com"
@@ -50,11 +50,11 @@
5050
"devDependencies": {
5151
"@tsconfig/recommended": "^1.0.2",
5252
"@types/node": "^18.13.0",
53-
"@typescript-eslint/eslint-plugin": "^5.51.0",
54-
"@typescript-eslint/parser": "^5.51.0",
53+
"@typescript-eslint/eslint-plugin": "^5.52.0",
54+
"@typescript-eslint/parser": "^5.52.0",
5555
"antlr4ts-cli": "0.5.0-alpha.4",
5656
"copy-webpack-plugin": "^11.0.0",
57-
"eslint": "^8.33.0",
57+
"eslint": "^8.34.0",
5858
"gulp": "^4.0.2",
5959
"js-yaml": "^4.1.0",
6060
"merge-options": "^3.0.4",

server/package-lock.json

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Eliot van Uytfanghe",
66
"publisher": "EliotVU",
77
"license": "MIT",
8-
"version": "0.6.2",
8+
"version": "0.6.4",
99
"repository": {
1010
"type": "git",
1111
"url": "https://github.com/EliotVU/UnrealScript-Language-Service"
@@ -22,7 +22,7 @@
2222
"crc-32": "^1.2.2",
2323
"glob": "^8.1.0",
2424
"rxjs": "^7.8.0",
25-
"vscode-languageserver": "^8.0.2",
25+
"vscode-languageserver": "^8.1.0",
2626
"vscode-languageserver-textdocument": "^1.0.8"
2727
},
2828
"devDependencies": {

server/src/UC/Parser/Parser.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function parseText(text: string): UCParser {
2121
const inputStream = UCInputStream.fromString(text);
2222
const lexer = new UCLexer(inputStream);
2323
const tokens = new UCTokenStream(lexer);
24-
tokens.fill();
24+
// tokens.fill();
2525

2626
const parser = new UCParser(tokens);
2727
return parser;
@@ -51,7 +51,7 @@ function parseExec(parser: UCParser): { errors: string[] } {
5151

5252
describe('Grammar', () => {
5353
it('should have no syntax errors', () => {
54-
const tests = ['parser.constDecl.uc', 'parser.defaultPropertiesBlock.uc'];
54+
const tests = ['Grammar.uc', 'parser.constDecl.uc', 'parser.defaultPropertiesBlock.uc'];
5555
for (const testFileName of tests) {
5656
const text = getText(resolveExampleFileName(testFileName));
5757
const p = parseText(text);

server/src/UC/Symbols/ArrayOperations.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import { toName } from '../name';
22
import { NAME_ARRAY } from '../names';
33
import {
4-
DEFAULT_RANGE, ModifierFlags, StaticIntType, StaticMetaType, UCMethodLikeSymbol, UCParamSymbol,
5-
UCStructSymbol
4+
DEFAULT_RANGE,
5+
ModifierFlags,
6+
StaticIntType,
7+
StaticMetaType,
8+
UCMethodLikeSymbol,
9+
UCParamSymbol,
10+
UCStructSymbol,
611
} from './';
712

813
/** (defaultproperties) Acts as a template for array operations such as MyArray.Replace(item1, item2) etc. */
@@ -15,34 +20,29 @@ DefaultArray.addSymbol(EmptyOperation);
1520

1621
const AddOperation = new UCMethodLikeSymbol(toName('Add'));
1722
AddOperation.modifiers |= ModifierFlags.Intrinsic | ModifierFlags.Keyword;
18-
const AddElementParam = new UCParamSymbol({ name: toName('Element'), range: DEFAULT_RANGE });
19-
AddElementParam.type = StaticMetaType;
23+
const AddElementParam = new UCParamSymbol({ name: toName('Element'), range: DEFAULT_RANGE }, DEFAULT_RANGE, StaticMetaType);
2024
AddOperation.addSymbol(AddElementParam);
2125
AddOperation.params = [AddElementParam];
2226
DefaultArray.addSymbol(AddOperation);
2327

2428
const RemoveOperation = new UCMethodLikeSymbol(toName('Remove'));
2529
RemoveOperation.modifiers |= ModifierFlags.Intrinsic | ModifierFlags.Keyword;
26-
const RemoveElementParam = new UCParamSymbol({ name: toName('Element'), range: DEFAULT_RANGE });
27-
RemoveElementParam.type = StaticMetaType;
30+
const RemoveElementParam = new UCParamSymbol({ name: toName('Element'), range: DEFAULT_RANGE }, DEFAULT_RANGE, StaticMetaType);
2831
RemoveOperation.addSymbol(RemoveElementParam);
2932
RemoveOperation.params = [RemoveElementParam];
3033
DefaultArray.addSymbol(RemoveOperation);
3134

3235
const RemoveIndexOperation = new UCMethodLikeSymbol(toName('RemoveIndex'));
3336
RemoveIndexOperation.modifiers |= ModifierFlags.Intrinsic | ModifierFlags.Keyword;
34-
const RemoveIndexParam = new UCParamSymbol({ name: toName('Index'), range: DEFAULT_RANGE });
35-
RemoveIndexParam.type = StaticIntType;
37+
const RemoveIndexParam = new UCParamSymbol({ name: toName('Index'), range: DEFAULT_RANGE }, DEFAULT_RANGE, StaticIntType);
3638
RemoveIndexOperation.addSymbol(RemoveIndexParam);
3739
RemoveIndexOperation.params = [RemoveIndexParam];
3840
DefaultArray.addSymbol(RemoveIndexOperation);
3941

4042
const ReplaceOperation = new UCMethodLikeSymbol(toName('Replace'));
4143
ReplaceOperation.modifiers |= ModifierFlags.Intrinsic | ModifierFlags.Keyword;
42-
const ReplaceElement1Param = new UCParamSymbol({ name: toName('Element1'), range: DEFAULT_RANGE });
43-
ReplaceElement1Param.type = StaticMetaType;
44-
const ReplaceElement2Param = new UCParamSymbol({ name: toName('Element2'), range: DEFAULT_RANGE });
45-
ReplaceElement2Param.type = StaticMetaType;
44+
const ReplaceElement1Param = new UCParamSymbol({ name: toName('Element1'), range: DEFAULT_RANGE }, DEFAULT_RANGE, StaticMetaType);
45+
const ReplaceElement2Param = new UCParamSymbol({ name: toName('Element2'), range: DEFAULT_RANGE }, DEFAULT_RANGE, StaticMetaType);
4646
ReplaceOperation.addSymbol(ReplaceElement1Param);
4747
ReplaceOperation.addSymbol(ReplaceElement2Param);
4848
ReplaceOperation.params = [ReplaceElement1Param, ReplaceElement2Param];

0 commit comments

Comments
 (0)