Skip to content

Commit ae8e948

Browse files
Merge pull request #25 from tech-beeline/1.0.8
1.0.8
2 parents 3aa1149 + 81757af commit ae8e948

23 files changed

Lines changed: 551 additions & 301 deletions

README.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@
55
This Visual Studio Code extension enables software architecture modeling using the [Structurizr DSL](https://github.com/structurizr/dsl). The Structurizr DSL implements the "diagrams as code" approach ([learn more](https://docs.structurizr.com/)) and provides a textual representation of the [C4 model](https://c4model.com/).
66

77
The extension includes:
8-
- A language server built on the official Structurizr DSL parser
8+
- A language server built on the official [Structurizr DSL](https://github.com/structurizr/java/tree/master/structurizr-dsl) parser
99
- Advanced capabilities for architectural description automation
10-
- Diagram visualization
11-
- DSL conversion to other formats
10+
- Syntax highlighting and validation
11+
- Text decorations
12+
- Go to Definition
13+
- Diagram visualization (embedded or structurizr.com cloud)
14+
- Graphviz based diagram auto layouting
15+
- Workspace.json based diagram manual layouting
16+
- Diagram exporing to .svg and .drawio, back imprting layout from .drawio
17+
- Support for workspace extends and `!include` files
1218

1319
## Prerequisites
1420

1521
- **Java 17+** ([download](https://dev.java/download)) - required for the language server
1622
- Workspace containing model files with `.dsl` extension
17-
- Support for multiple workspaces and `!include` files
1823

1924
## Features
2025

@@ -75,10 +80,10 @@ Export diagram to **drawio** and **svg** formats
7580
|--------|--------|---------|-------------|
7681
| `c4.diagram.render` | String | `embedded` | Diagram rendering method (embedded or structurizr.com cloud) |
7782
| `c4.editor.autoformat.indent` | Number | `4` | Spaces per indentation level |
78-
| `c4.languageserver.logs.enabled` | `true`/`false` | `false` | Enable language server logging to `c4-language-server.log` |
83+
| `c4.languageserver.logs.enabled` | `true`/`false` | `false` | Enable language server logging |
7984
| `c4.decorations.enabled` | `off`, `onChange`, `onSave` | `onChange` | Text decoration timing |
80-
| `c4.SSL\TLS.disabled` | `true`/`false` | `false` | Disable SSL/TLS verification |
81-
| `c4.beeline.telemetry.disabled` | `true`/`false` | `false` | Disable ArchOPS telemetry collection |
85+
| `c4.beeline.cert.verification.enabled` | `true`/`false` | `false` | Enable SSL-certificate verification when interacting with the ArchOPS server |
86+
| `c4.beeline.telemetry.enabled` | `true`/`false` | `true` | Enable telemetry collection when interacting with the ArchOPS server |
8287
| `c4.beeline.api.url` | URL | | ArchOPS server URL |
8388
| `c4.beeline.api.key` | String | | ArchOPS API key |
8489
| `c4.beeline.api.secret` | String | | ArchOPS API secret |

c4-server/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
</properties>
2020

2121
<dependencies>
22+
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
23+
<dependency>
24+
<groupId>org.apache.commons</groupId>
25+
<artifactId>commons-text</artifactId>
26+
<version>1.14.0</version>
27+
</dependency>
2228
<!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
2329
<dependency>
2430
<groupId>ch.qos.logback</groupId>

c4-server/src/main/java/ru/beeatlas/c4/C4LanguageServerLauncher.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.slf4j.Logger;
3434
import org.slf4j.LoggerFactory;
3535

36+
import ru.beeatlas.c4.custom.Custom;
3637
import ru.beeatlas.c4.service.C4LanguageServer;
3738
import picocli.CommandLine;
3839
import picocli.CommandLine.Option;
@@ -68,6 +69,7 @@ public Integer call() throws Exception {
6869
LanguageClient client = launcher.getRemoteProxy();
6970
// Set the client to language server
7071
c4LanguageServer.connect(client);
72+
Custom.getInstance().setClient(client);
7173
// Start the listener for JsonRPC
7274
Future<?> startListening = launcher.startListening();
7375
// Get the computed result from LS.

0 commit comments

Comments
 (0)