laravel-ls/uri
1
0
Fork 0
mirror of https://github.com/laravel-ls/uri synced 2026-06-16 01:54:57 +02:00
Code Activity

uri: fix String method logic

Browse source
This commit is contained in:
Koichi Shiraishi 2019-06-05 15:36:52 +09:00
parent 754c1e1256
commit e2736f1bb7
No known key found for this signature in database
GPG key ID: A71DFD3B4DA7A79B
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
uri.go
View file

@ -231,17 +231,16 @@ func (u *URI) UnmarshalJSON(b []byte) error {
}
// String implements fmt.Stringer.
func (u URI) String() string {
func (u *URI) String() string {
switch u.Scheme {
case FileScheme, HTTPScheme, HTTPSScheme:
if u.skipEncoding {
return format(u, false) // fast-path
return u.formatted
}
if u.formatted == "" {
u.formatted = format(u, true)
u.skipEncoding = true
}
u.formatted = format(*u, true)
u.skipEncoding = true
return u.formatted
default:
@ -271,12 +270,12 @@ var encodeTable = map[byte]string{
Space: "%20",
}
func encodeFast(uri string, allowSlash bool) string {
func encodeFast(uriComponent string, allowSlash bool) string {
b := new(strings.Builder)
nativeEncodePos := -1
for i := 0; i < len(uri); i++ {
code := uri[i]
for pos := 0; pos < len(uriComponent); pos++ {
code := uriComponent[pos]
switch {
case code >= LowerA && code <= LowerZ,
@ -289,33 +288,37 @@ func encodeFast(uri string, allowSlash bool) string {
allowSlash && (code == Slash):
if nativeEncodePos != -1 {
b.WriteString(url.PathEscape(uri[nativeEncodePos:i]))
b.WriteString(uriComponent[nativeEncodePos:pos])
nativeEncodePos = -1
}
if b.String() != "" {
b.WriteString(uri[:i])
str := b.String()
if str != "" {
b.WriteString(str)
b.WriteString(uriComponent[:pos])
}
default:
if b.String() == "" {
b.WriteString(uri[0:i])
str := b.String()
if str != "" {
b.WriteString(str)
b.WriteString(uriComponent[0:pos])
}
escaped := encodeTable[code]
if escaped != "" {
if nativeEncodePos != -1 {
b.WriteString(url.PathEscape(uri[nativeEncodePos:i]))
b.WriteString(uriComponent[nativeEncodePos:pos])
}
b.WriteString(escaped)
} else {
nativeEncodePos = i
} else if nativeEncodePos == -1 {
nativeEncodePos = pos
}
}
}
if nativeEncodePos != -1 {
b.WriteString(uri[:nativeEncodePos])
b.WriteString(uriComponent[:nativeEncodePos])
}
return b.String()
@ -404,7 +407,7 @@ func format(uri URI, skipEncoding bool) string {
if len(path) >= 3 && path[0] == Slash && path[2] == Colon {
code := path[1]
if code >= UpperA && code <= UpperZ {
path = string(code+32) + ":" + string(path[3]) // "/c:".length == 3
path = "/" + string(code+32) + ":" + string(path[3]) // "/c:".length == 3
}
} else if len(path) >= 2 && path[1] == Colon {
code := path[0]