Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump langium from 3.0.0 to 3.1.1 #1221

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,308 changes: 1,371 additions & 937 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 13 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,21 @@
"@semantic-release/git": "^10.0.1",
"@semantic-release/npm": "^12.0.1",
"@tsconfig/svelte": "^5.0.4",
"@vitest/coverage-v8": "^1.6.0",
"concurrently": "^8.2.2",
"@vitest/coverage-v8": "^2.1.1",
"concurrently": "^9.0.1",
"conventional-changelog-conventionalcommits": "^8.0.0",
"semantic-release": "^24.0.0",
"semantic-release": "^24.1.1",
"shx": "^0.3.4",
"svelte": "^4.2.19",
"typescript": "^5.5.2",
"vitest": "^1.3.1"
"typescript": "^5.6.2",
"vitest": "^2.1.1"
},
"prettier": "@lars-reimann/prettier-config-svelte"
"prettier": "@lars-reimann/prettier-config-svelte",
"dependencies": {
"@safe-ds/cli": "^0.17.0",
"@safe-ds/eda": "^0.0.0",
"@types/vscode": "^1.93.0",
"svelte-check": "^4.0.2",
"true-myth": "^8.0.1"
}
}
10 changes: 5 additions & 5 deletions packages/safe-ds-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@
"@safe-ds/lang": ">=0.3.0",
"chalk": "^5.3.0",
"commander": "^12.1.0",
"glob": "^10.4.2",
"langium": "^3.0.0",
"true-myth": "^7.4.0"
"glob": "^11.0.0",
"langium": "^3.2.0",
"true-myth": "^8.0.1"
},
"devDependencies": {
"@types/node": "^18.18.12",
"@types/node": "^20.16.7",
"vscode-languageserver": "^9.0.1"
},
"engines": {
"node": ">=18.0.0"
"node": ">=20.0.0"
},
"publishConfig": {
"provenance": true
Expand Down
4 changes: 2 additions & 2 deletions packages/safe-ds-eda/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^3.1.2",
"@types/lodash": "^4.17.4",
"svelte-check": "^3.8.4",
"@types/lodash": "^4.17.9",
"svelte-check": "^4.0.2",
"vite": "^5.4.6"
}
}
18 changes: 9 additions & 9 deletions packages/safe-ds-lang/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,23 @@
},
"dependencies": {
"chevrotain": "^11.0.3",
"glob": "^10.4.2",
"langium": "^3.0.0",
"semver": "^7.6.3",
"glob": "^11.0.0",
"langium": "^3.2.0",
"semver": "^7.6.2",
"source-map-js": "^1.2.0",
"tree-kill": "^1.2.2",
"vscode-languageserver": "^9.0.1",
"vscode-languageserver-textdocument": "^1.0.12",
"ws": "^8.17.1"
"ws": "^8.18.0"
},
"devDependencies": {
"@types/node": "^18.18.12",
"@types/ws": "^8.5.10",
"langium-cli": "^3.0.3",
"true-myth": "^7.4.0"
"@types/node": "^20.16.7",
"@types/ws": "^8.5.12",
"langium-cli": "^3.2.0",
"true-myth": "^8.0.1"
},
"engines": {
"node": ">=18.0.0"
"node": ">=20.0.0"
},
"publishConfig": {
"provenance": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import { classTypeParameterIsUsedInCorrectPosition } from '../validation/other/d

export class SafeDsCompletionProvider extends DefaultCompletionProvider {
private readonly builtinAnnotations: SafeDsAnnotations;
private readonly documentationProvider: SafeDsDocumentationProvider;
protected override readonly documentationProvider: SafeDsDocumentationProvider;

readonly completionOptions = {
override readonly completionOptions = {
triggerCharacters: ['.', '@'],
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,11 @@ export class SafeDsFormatter extends AbstractFormatter {

const lastAnnotationCall = last(getAnnotationCalls(node));
if (lastAnnotationCall) {
formatter.node(lastAnnotationCall).append(newLine());
if (node.isConstant) {
formatter.keyword('const').prepend(newLine());
} else {
formatter.property('name').prepend(newLine());
}
}

formatter.keyword('const').append(oneSpace());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ export class EvaluatedNamedTuple extends EvaluatedNode {
*/
override unwrap(): EvaluatedNode {
if (this.entries.size === 1) {
return this.entries.values().next().value;
return this.entries.values().next().value!;
} else {
return this;
}
Expand Down
5 changes: 0 additions & 5 deletions packages/safe-ds-lang/src/language/safe-ds-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import {
SafeDsMessagingProvider,
type SafeDsUserInteractionProvider,
} from './communication/safe-ds-messaging-provider.js';
import { SafeDsConfigurationProvider } from './workspace/safe-ds-configuration-provider.js';
import { SafeDsCodeLensProvider } from './lsp/safe-ds-code-lens-provider.js';
import { SafeDsExecuteCommandHandler } from './lsp/safe-ds-execute-command-handler.js';
import { SafeDsServiceRegistry } from './safe-ds-service-registry.js';
Expand Down Expand Up @@ -112,9 +111,6 @@ export type SafeDsAddedServices = {

export type SafeDsAddedSharedServices = {
ServiceRegistry: SafeDsServiceRegistry;
workspace: {
ConfigurationProvider: SafeDsConfigurationProvider;
};
};

/**
Expand Down Expand Up @@ -209,7 +205,6 @@ export const SafeDsSharedModule: Module<SafeDsSharedServices, DeepPartial<SafeDs
NodeKindProvider: () => new SafeDsNodeKindProvider(),
},
workspace: {
ConfigurationProvider: (sharedServices) => new SafeDsConfigurationProvider(sharedServices),
WorkspaceManager: (sharedServices) => new SafeDsWorkspaceManager(sharedServices),
},
};
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { SafeDsServices } from '../safe-ds-module.js';
import { SafeDsLanguageMetaData } from '../generated/module.js';
import { SafeDsConfigurationProvider } from './safe-ds-configuration-provider.js';
import { DeepPartial, Disposable } from 'langium';
import { ConfigurationProvider, DeepPartial, Disposable } from 'langium';

export class SafeDsSettingsProvider {
private readonly configurationProvider: SafeDsConfigurationProvider;
private readonly configurationProvider: ConfigurationProvider;

private cachedSettings: DeepPartial<SafeDsSettings> = {};
private watchers = new Set<SettingsWatcher<any>>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ package tests.callGraph.callable.function
@Pure fun g()

// $TEST$ ["myFunction", "f", "g"]
@Pure »fun myFunction(param1: Any = f(), param2: () -> () = g)«
»@Pure fun myFunction(param1: Any = f(), param2: () -> () = g)«
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="4"
```sds linenums="3"
@Deprecated
annotation MyAnnotation1
```
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Description of MyAnnotation3.

??? quote "Stub code in `main.sdsstub`"

```sds linenums="20"
```sds linenums="19"
@Targets([AnnotationTarget.Annotation])
annotation MyAnnotation3
```
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="4"
```sds linenums="3"
@Experimental
annotation MyAnnotation1
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="8"
```sds linenums="7"
@Targets([AnnotationTarget.Annotation])
annotation MyAnnotation3
```
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ search:

??? quote "Stub code in `main.sdsstub`"

```sds linenums="4"
```sds linenums="3"
@Deprecated
class MyClass1
```
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ Description of myAttribute1.

## <code class="doc-symbol doc-symbol-function"></code> `myFunction1` {#tests.generation.markdown.classes.documented.MyClass8.myFunction1 data-toc-label='[function] myFunction1'}

Description of myFunction1.

??? quote "Stub code in `main.sdsstub`"

```sds linenums="68"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ search:

??? quote "Stub code in `main.sdsstub`"

```sds linenums="4"
```sds linenums="3"
@Experimental
class MyClass1
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="4"
```sds linenums="3"
@Deprecated
schema MySchema1 {}
```
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="9"
```sds linenums="6"
@Deprecated(
alternative = "Something else",
)
schema MySchema2 {}
```
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="14"
```sds linenums="11"
@Deprecated(
reason = "To annoy you",
)
schema MySchema3 {}
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="19"
```sds linenums="16"
@Deprecated(
sinceVersion = "1.0.0"
)
schema MySchema4 {}
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="24"
```sds linenums="21"
@Deprecated(
removalVersion = "2.0.0",
)
schema MySchema5 {}
```
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="32"
```sds linenums="26"
@Deprecated(
alternative = "Something else",
reason = "To annoy you",
sinceVersion = "1.0.0",
removalVersion = "2.0.0",
)
schema MySchema6 {}
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="4"
```sds linenums="3"
@Deprecated
enum MyEnum1
```
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="4"
```sds linenums="3"
@Experimental
enum MyEnum1
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

??? quote "Stub code in `main.sdsstub`"

```sds linenums="5"
```sds linenums="3"
@Deprecated
@Pure
fun myFunction1()
```
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Description of myFunction1.

??? quote "Stub code in `main.sdsstub`"

```sds linenums="7"
```sds linenums="6"
@Pure
fun myFunction1()
```
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ Description of myFunction2.

??? quote "Stub code in `main.sdsstub`"

```sds linenums="17"
```sds linenums="16"
@Pure
fun myFunction2<TypeParam1, TypeParam2 sub MyClass1, TypeParam3 = MyClass1>(
param1: TypeParam1,
param2: TypeParam2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Description of myFunction3.

??? quote "Stub code in `main.sdsstub`"

```sds linenums="30"
```sds linenums="29"
@Pure
fun myFunction3(param1: MyClass1, param2: Float = 1.0)
```
Loading
Loading