Skip to content

Commit

Permalink
An inline struct field written without identifier crashed server.
Browse files Browse the repository at this point in the history
Fixes #97
  • Loading branch information
pherrymason committed Jan 22, 2025
1 parent ba836dd commit e628c5a
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ parser/chumsky
server/internal/parser
server/bin
dist/
docs/help
2 changes: 1 addition & 1 deletion server/cmd/lsp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/pherrymason/c3-lsp/internal/lsp/server"
)

const version = "0.3.3"
const version = "0.3.4"
const prerelease = false
const appName = "C3-LSP"

Expand Down
20 changes: 11 additions & 9 deletions server/pkg/parser/node_to_struct.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,15 +184,17 @@ func (p *Parser) parse_struct_body(bodyNode *sitter.Node, currentModule *idx.Mod
structFields = append(structFields, &structMember)
}
} else if isInline {
membersNeedingSubtypingResolve = append(membersNeedingSubtypingResolve, fieldType)
structMember := idx.NewInlineSubtype(
identifier,
fieldType,
currentModule.GetModuleString(),
*docId,
identifiersRange[0],
)
structFields = append(structFields, &structMember)
if len(identifiersRange) > 0 {
membersNeedingSubtypingResolve = append(membersNeedingSubtypingResolve, fieldType)
structMember := idx.NewInlineSubtype(
identifier,
fieldType,
currentModule.GetModuleString(),
*docId,
identifiersRange[0],
)
structFields = append(structFields, &structMember)
}
} else if len(identifier) > 0 {
structMember := idx.NewStructMember(
identifier,
Expand Down
19 changes: 19 additions & 0 deletions server/pkg/parser/parse_structs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,25 @@ func TestParse_struct_subtyping_members_should_be_flagged(t *testing.T) {
assert.True(t, members[0].IsInlinePendingToResolve(), "Member should be flagged to be inlined")
assert.Equal(t, idx.NewRange(6, 16, 6, 22), members[0].GetIdRange(), "Identifier range is wrong")
})

t.Run("should not break when inline substruct still has no identifier written", func(t *testing.T) {
source := `module x;
struct Person {
int age;
String name;
}
struct ImportantPerson {
inline Person
}`
doc := document.NewDocument("docId", source)
parser := createParser()

symbols, _ := parser.ParseSymbols(&doc)
module := symbols.Get("x")

_, ok := module.Structs["ImportantPerson"]
assert.True(t, ok)
})
}

func TestParse_Unions(t *testing.T) {
Expand Down

0 comments on commit e628c5a

Please sign in to comment.