Skip to content
Merged
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 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Zig
uses: mlugg/setup-zig@v2
with:
version: master
version: 0.16.0

- name: Generate Documentation
run: zig build docs --summary all
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Zig
uses: mlugg/setup-zig@v2
with:
version: master
version: 0.16.0

- name: Setup kcov
if: github.repository_owner == 'zigtools' && matrix.os == 'ubuntu-22.04'
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.zig-cache
zig-out

zig-cache
zig-pkg
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Provides the necessary building blocks to develop Language Server Protocol imple
# Installation

> [!NOTE]
> The default branch requires Zig `0.16.0-dev.2736+3b515fbed` or later. Checkout the `0.15.x` branch when using Zig 0.15
> The default branch requires Zig `0.16.0` or later.
```bash
# Initialize a `zig build` project if you haven't already
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.{
.name = .lsp_kit,
.version = "0.1.0",
.minimum_zig_version = "0.16.0-dev.2736+3b515fbed",
.minimum_zig_version = "0.16.0",
.dependencies = .{},
.paths = .{
"build.zig",
Expand Down
2 changes: 1 addition & 1 deletion examples/hello_server.zig
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub fn main(init: std.process.Init) !void {
const transport: *lsp.Transport = &stdio_transport.transport;

// keep track of opened documents
var documents: std.StringArrayHashMapUnmanaged([]const u8) = .empty;
var documents: std.array_hash_map.String([]const u8) = .empty;
defer {
for (documents.keys()) |uri| gpa.free(uri);
for (documents.values()) |source| gpa.free(source);
Expand Down
16 changes: 8 additions & 8 deletions src/codegen/codegen.zig
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ const Symbol = union(enum) {
};

const SymbolTree = struct {
root: std.StringArrayHashMapUnmanaged(Node) = .empty,
root: std.array_hash_map.String(Node) = .empty,

const Node = struct {
symbol: Symbol,
children: std.StringArrayHashMapUnmanaged(Node) = .empty,
children: std.array_hash_map.String(Node) = .empty,

fn deinit(
node: *Node,
Expand Down Expand Up @@ -258,7 +258,7 @@ const SymbolTree = struct {

fn dumpNode(
l: *@This(),
children: std.StringArrayHashMapUnmanaged(Node),
children: std.array_hash_map.String(Node),
writer: *std.Io.Writer,
) error{WriteFailed}!void {
for (children.keys(), children.values(), 0..) |name, child_node, i| {
Expand Down Expand Up @@ -292,7 +292,7 @@ const Renderer = struct {

const Scope = struct {
name: ?[]const u8,
symbols: std.StringArrayHashMapUnmanaged(SymbolTree.Node),
symbols: std.array_hash_map.String(SymbolTree.Node),
};

fn renderNode(r: *Renderer, node: *const SymbolTree.Node, name: []const u8) error{WriteFailed}!void {
Expand Down Expand Up @@ -461,7 +461,7 @@ const Renderer = struct {
fn renderType(
r: *Renderer,
ty: MetaModel.Type,
children: std.StringArrayHashMapUnmanaged(SymbolTree.Node),
children: std.array_hash_map.String(SymbolTree.Node),
) error{WriteFailed}!void {
switch (ty) {
.@"and", .@"or" => {},
Expand Down Expand Up @@ -653,7 +653,7 @@ const Renderer = struct {
const FormatType = struct {
r: *Renderer,
ty: MetaModel.Type,
children: std.StringArrayHashMapUnmanaged(SymbolTree.Node) = .empty,
children: std.array_hash_map.String(SymbolTree.Node) = .empty,

pub fn format(
ctx: FormatType,
Expand Down Expand Up @@ -798,7 +798,7 @@ fn constructSymbolTree(
arena: std.mem.Allocator,
meta_model: *const MetaModel,
) error{OutOfMemory}!SymbolTree {
var symbols: std.StringArrayHashMapUnmanaged(Symbol) = .empty;
var symbols: std.array_hash_map.String(Symbol) = .empty;
defer symbols.deinit(gpa);

try symbols.ensureTotalCapacity(
Expand Down Expand Up @@ -1015,7 +1015,7 @@ fn renderMetaModel(gpa: std.mem.Allocator, meta_model: *MetaModel) error{ OutOfM
}

{
var original_symbol_names: std.StringArrayHashMapUnmanaged(void) = .empty;
var original_symbol_names: std.array_hash_map.String(void) = .empty;
defer original_symbol_names.deinit(gpa);
try original_symbol_names.ensureTotalCapacity(gpa, meta_model.structures.len + meta_model.enumerations.len + meta_model.typeAliases.len);
for (meta_model.structures) |structure| original_symbol_names.putAssumeCapacityNoClobber(structure.name, {});
Expand Down
Loading