Myzel394/config-lsp
1
0
Fork 0
mirror of https://github.com/Myzel394/config-lsp.git synced 2025-06-19 07:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(hosts): Improve hosts structure

Browse Source
This commit is contained in:
Myzel394 2024-08-29 22:51:39 +02:00
parent 48bbb0f68b
commit 5cbf5be8ad
No known key found for this signature in database
GPG Key ID: DEC4AAB876F73185
31 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
handlers/aliases/tree/aliases.go → handlers/aliases/ast/aliases.go
View File

0
handlers/aliases/tree/handler.go → handlers/aliases/ast/handler.go
View File

0
handlers/aliases/tree/listener.go → handlers/aliases/ast/listener.go
View File

0
handlers/aliases/tree/parser.go → handlers/aliases/ast/parser.go
View File

0
handlers/aliases/tree/parser_test.go → handlers/aliases/ast/parser_test.go
View File

0
handlers/aliases/tree/values.go → handlers/aliases/ast/values.go
View File

0
handlers/hosts/handlers/analyzer/analyzer.go → handlers/hosts/analyzer/analyzer.go
View File

0
handlers/hosts/handlers/analyzer/double_ips.go → handlers/hosts/analyzer/double_ips.go
View File

2
handlers/hosts/handlers/analyzer/double_ips_test.go → handlers/hosts/analyzer/double_ips_test.go
View File

@ -2,7 +2,7 @@ package analyzer
import (
"config-lsp/handlers/hosts"
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/ast"
"config-lsp/handlers/hosts/indexes"
"config-lsp/handlers/hosts/shared"
"config-lsp/utils"

2
handlers/hosts/handlers/analyzer/handler_test.go → handlers/hosts/analyzer/handler_test.go
View File

@ -1,7 +1,7 @@
package analyzer
import (
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/ast"
"config-lsp/utils"
"net"
"testing"

2
handlers/hosts/handlers/analyzer/resolve.go → handlers/hosts/analyzer/resolve.go
View File

@ -3,7 +3,7 @@ package analyzer
import (
"config-lsp/common"
"config-lsp/handlers/hosts"
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/ast"
"config-lsp/handlers/hosts/indexes"
"config-lsp/handlers/hosts/shared"
"config-lsp/utils"

2
handlers/hosts/handlers/analyzer/resolver_test.go → handlers/hosts/analyzer/resolver_test.go
View File

@ -1,7 +1,7 @@
package analyzer
import (
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/ast"
"config-lsp/utils"
"testing"
)

2
handlers/hosts/handlers/analyzer/values.go → handlers/hosts/analyzer/values.go
View File

@ -3,8 +3,8 @@ package analyzer
import (
"config-lsp/common"
docvalues "config-lsp/doc-values"
"config-lsp/handlers/hosts/ast"
"config-lsp/handlers/hosts/fields"
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/utils"
"errors"
)

0
handlers/hosts/handlers/ast/hosts.go → handlers/hosts/ast/hosts.go
View File

16
handlers/hosts/handlers/ast/listener.go → handlers/hosts/ast/listener.go
View File

@ -3,7 +3,7 @@ package ast
import (
"config-lsp/common"
docvalues "config-lsp/doc-values"
"config-lsp/handlers/hosts/parser"
parser2 "config-lsp/handlers/hosts/ast/parser"
"net"
"github.com/antlr4-go/antlr/v4"
@ -14,18 +14,18 @@ type hostsListenerContext struct {
}
type hostsParserListener struct {
*parser.BaseHostsListener
*parser2.BaseHostsListener
Parser *HostsParser
Errors []common.LSPError
hostsContext hostsListenerContext
}
func (s *hostsParserListener) EnterComment(ctx *parser.CommentContext) {
func (s *hostsParserListener) EnterComment(ctx *parser2.CommentContext) {
line := uint32(s.hostsContext.line)
s.Parser.CommentLines[line] = struct{}{}
}
func (s *hostsParserListener) EnterEntry(ctx *parser.EntryContext) {
func (s *hostsParserListener) EnterEntry(ctx *parser2.EntryContext) {
location := common.CharacterRangeFromCtx(ctx.BaseParserRuleContext)
location.ChangeBothLines(s.hostsContext.line)
@ -34,7 +34,7 @@ func (s *hostsParserListener) EnterEntry(ctx *parser.EntryContext) {
}
}
func (s *hostsParserListener) EnterIpAddress(ctx *parser.IpAddressContext) {
func (s *hostsParserListener) EnterIpAddress(ctx *parser2.IpAddressContext) {
location := common.CharacterRangeFromCtx(ctx.BaseParserRuleContext)
location.ChangeBothLines(s.hostsContext.line)
@ -65,7 +65,7 @@ func (s *hostsParserListener) EnterIpAddress(ctx *parser.IpAddressContext) {
}
}
func (s *hostsParserListener) EnterHostname(ctx *parser.HostnameContext) {
func (s *hostsParserListener) EnterHostname(ctx *parser2.HostnameContext) {
location := common.CharacterRangeFromCtx(ctx.BaseParserRuleContext)
location.ChangeBothLines(s.hostsContext.line)
@ -79,7 +79,7 @@ func (s *hostsParserListener) EnterHostname(ctx *parser.HostnameContext) {
s.Parser.Tree.Entries[location.Start.Line] = entry
}
func (s *hostsParserListener) EnterAliases(ctx *parser.AliasesContext) {
func (s *hostsParserListener) EnterAliases(ctx *parser2.AliasesContext) {
location := common.CharacterRangeFromCtx(ctx.BaseParserRuleContext)
location.ChangeBothLines(s.hostsContext.line)
@ -90,7 +90,7 @@ func (s *hostsParserListener) EnterAliases(ctx *parser.AliasesContext) {
entry.Aliases = aliases
}
func (s *hostsParserListener) EnterAlias(ctx *parser.AliasContext) {
func (s *hostsParserListener) EnterAlias(ctx *parser2.AliasContext) {
location := common.CharacterRangeFromCtx(ctx.BaseParserRuleContext)
location.ChangeBothLines(s.hostsContext.line)

6
handlers/hosts/handlers/ast/parser.go → handlers/hosts/ast/parser.go
View File

@ -2,7 +2,7 @@ package ast
import (
"config-lsp/common"
"config-lsp/handlers/hosts/parser"
parser2 "config-lsp/handlers/hosts/ast/parser"
"config-lsp/utils"
"regexp"
@ -26,7 +26,7 @@ func (p *HostsParser) parseStatement(
stream := antlr.NewInputStream(input)
errorListener := createErrorListener(line)
lexer := parser.NewHostsLexer(stream)
lexer := parser2.NewHostsLexer(stream)
lexer.RemoveErrorListeners()
lexer.AddErrorListener(&errorListener)
@ -34,7 +34,7 @@ func (p *HostsParser) parseStatement(
errorListener = createErrorListener(line)
tokenStream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
antlrParser := parser.NewHostsParser(tokenStream)
antlrParser := parser2.NewHostsParser(tokenStream)
antlrParser.RemoveErrorListeners()
antlrParser.AddErrorListener(&errorListener)

0
handlers/hosts/parser/Hosts.interp → handlers/hosts/ast/parser/Hosts.interp
View File

0
handlers/hosts/parser/Hosts.tokens → handlers/hosts/ast/parser/Hosts.tokens
View File

0
handlers/hosts/parser/HostsLexer.interp → handlers/hosts/ast/parser/HostsLexer.interp
View File

0
handlers/hosts/parser/HostsLexer.tokens → handlers/hosts/ast/parser/HostsLexer.tokens
View File

0
handlers/hosts/parser/hosts_base_listener.go → handlers/hosts/ast/parser/hosts_base_listener.go
View File

0
handlers/hosts/parser/hosts_lexer.go → handlers/hosts/ast/parser/hosts_lexer.go
View File

0
handlers/hosts/parser/hosts_listener.go → handlers/hosts/ast/parser/hosts_listener.go
View File

0
handlers/hosts/parser/hosts_parser.go → handlers/hosts/ast/parser/hosts_parser.go
View File

2
handlers/hosts/handlers/code-actions.go
View File

@ -1,7 +1,7 @@
package handlers
import (
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/ast"
"config-lsp/utils"
"fmt"
"strings"

2
handlers/hosts/handlers/hover.go
View File

@ -2,7 +2,7 @@ package handlers
import (
"config-lsp/handlers/hosts"
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/ast"
"fmt"
)

4
handlers/hosts/indexes/indexes.go
View File

@ -1,6 +1,8 @@
package indexes
import "config-lsp/handlers/hosts/shared"
import (
"config-lsp/handlers/hosts/shared"
)
type HostsIndexes struct {
Resolver *Resolver

2
handlers/hosts/lsp/text-document-did-change.go
View File

@ -3,7 +3,7 @@ package lsp
import (
"config-lsp/common"
"config-lsp/handlers/hosts"
"config-lsp/handlers/hosts/handlers/analyzer"
"config-lsp/handlers/hosts/analyzer"
"config-lsp/utils"
"github.com/tliron/glsp"

4
handlers/hosts/lsp/text-document-did-open.go
View File

@ -3,8 +3,8 @@ package lsp
import (
"config-lsp/common"
"config-lsp/handlers/hosts"
"config-lsp/handlers/hosts/handlers/analyzer"
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/analyzer"
"config-lsp/handlers/hosts/ast"
"config-lsp/handlers/hosts/indexes"
"config-lsp/utils"

2
handlers/hosts/lsp/text-document-hover.go
View File

@ -2,9 +2,9 @@ package lsp
import (
"config-lsp/handlers/hosts"
"config-lsp/handlers/hosts/ast"
"config-lsp/handlers/hosts/fields"
"config-lsp/handlers/hosts/handlers"
"config-lsp/handlers/hosts/handlers/ast"
"strings"
"github.com/tliron/glsp"

3
handlers/hosts/shared.go
View File

@ -1,9 +1,8 @@
package hosts
import (
"config-lsp/handlers/hosts/handlers/ast"
"config-lsp/handlers/hosts/ast"
"config-lsp/handlers/hosts/indexes"
protocol "github.com/tliron/glsp/protocol_3_16"
)