interesting
/
aminal
mirror of https://github.com/liamg/aminal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#205 smarter URL/URI parsing

This commit is contained in:
Roman Shevchenko 2019-03-16 14:18:21 +03:00
parent 4f308bdbd8
commit 394bc54473
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
buffer/buffer.go
View File

@ -76,23 +76,13 @@ func (buffer *Buffer) GetURLAtPosition(col uint16, viewRow uint16) string {
row := buffer.convertViewLineToRawLine((viewRow)) - uint64(buffer.terminalState.scrollLinesFromBottom)
cell := buffer.GetRawCell(col, row)
if cell == nil || cell.Rune() == 0x00 {
if cell == nil || isRuneURLSelectionMarker(cell.Rune()) {
return ""
}
candidate := ""
for i := col; i >= uint16(0); i-- {
cell := buffer.GetRawCell(i, row)
if cell == nil {
break
}
if isRuneURLSelectionMarker(cell.Rune()) {
break
}
candidate = fmt.Sprintf("%c%s", cell.Rune(), candidate)
}
candidate := string(cell.Rune())
// First, move forward
for i := col + 1; i < buffer.terminalState.viewWidth; i++ {
cell := buffer.GetRawCell(i, row)
if cell == nil {
@ -104,6 +94,27 @@ func (buffer *Buffer) GetURLAtPosition(col uint16, viewRow uint16) string {
candidate = fmt.Sprintf("%s%c", candidate, cell.Rune())
}
// Move backwards
protocolMode := strings.Contains(candidate, "://")
for i := col - 1; i >= uint16(0); i-- {
cell := buffer.GetRawCell(i, row)
if cell == nil {
break
}
c := cell.Rune()
if isRuneURLSelectionMarker(c) {
break
}
// if we're tracking left of :// we want to break on any non-Latin character
if protocolMode && !(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z') {
break
}
candidate = fmt.Sprintf("%c%s", cell.Rune(), candidate)
if !protocolMode && c == ':' {
protocolMode = strings.Contains(candidate, "://")
}
}
if candidate == "" || candidate[0] == '/' {
return ""
}