fix parsing of urls

Author: chrishrb

README.md

@@ -1 +1,35 @@
-# gx.nvim
+# 🔗 gx.nvim
+
+## ✨ Features
+
+* open links without `netrw`
+* more to come (github, jira, ..)
+
+## ⚡️ Requirements
+
+* Neovim >= 0.5.0
+* macOS (`open`) or linux (`xdg-open`)
+
+## 📦 Installation 
+
+### [lazy.nvim](https://github.com/folke/lazy.nvim)
+
+```lua
+
+require("lazy").setup({
+  {
+    "chrishrb/gx.nvim",
+    config = function()
+      require("gx").setup()
+    end,
+  },
+})
+```
+
+## ⌨️ Mappings
+
+* `gx` is overriden by default
+
+## 🚀 Usage
+
+When your cursor is over a link or you mark a link or part of a link with the visual mode, you can press `gx` to open the link in the browser.

after/plugin/gx.lua

@@ -13,14 +13,13 @@ local function visual_selection_range()
 end
 
 -- check that cursor on uri in normal mode
-function M.checkIfCursorOnUri(mode, i, j)
+function M.checkIfCursorOnUrl(mode, i, j)
   if mode ~= "n" then
     return true
   end
 
   local col = vim.api.nvim_win_get_cursor(0)[2]
   if i <= (col + 1) and j >= (col + 1) then
-    print(i, col, j)
     return true
   end
 

lua/gx/helper.lua

@@ -1,6 +1,6 @@
-local notfier = require "lua.gx.notfier"
-local helper = require "lua.gx.helper"
-local parser = require "lua.gx.parser"
+local notfier = require("gx.notfier")
+local helper = require("gx.helper")
+local parser = require("gx.parser")
 
 local keymap = vim.keymap.set
 local sysname = vim.loop.os_uname().sysname
@@ -35,9 +35,9 @@ local function searchForUrl()
   line = helper.cutWithVisualMode(mode, line)
 
   -- search for url
-  local i, j, url = parser.getUrl(line)
+  local url = parser.getUrl(mode, line)
 
-  if not helper.checkIfCursorOnUri(mode, i, j) then
+  if not url then
     return
   end
 

lua/gx/init.lua

@@ -1,16 +1,26 @@
-local pattern = "[%a]*://.*%.[/?_%d%a]*"
+local helper = require("gx.helper")
 
 local M = {}
 
--- get uri from line
-function M.getUrl(line)
-  local i, j = string.find(line, pattern)
+-- find pattern in line and check if cursor on it
+local function find(line, mode, pattern, startIndex)
+  startIndex = startIndex or 1
+  local i, j = string.find(line, pattern, startIndex)
 
-  if not i then
-    return i, j, nil
+  if helper.checkIfCursorOnUrl(mode, i, j) then
+    return string.sub(line, i, j)
+  elseif not i then
+    return nil
+  else
+    return find(line, mode, pattern, j+1)
   end
+end
 
-  return i, j, string.sub(line, i, j)
+-- get url from line
+function M.getUrl(mode, line)
+  local pattern =   "[%a]*://[^)%]%[\"'`˚:,!:;{}]*%.[/?_%-%d%a]*"
+  local url = find(line, mode, pattern)
+  return url
 end
 
 -- TODO: add more parser