Merge pull request #46 from haya14busa/go-offset

Fix offset

Author: haya14busa

.drone.sec

@@ -1 +1 @@
-eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.fkWEl5SfcCEntdIFAB5yO4F91yx5a4jXdHvzgzY25HLo4dxGfCdFCrOGQKCNCulX4czQRaxXvESz-Dwki-lAh-TTeMuHSU0Xje7rPY4o0txxB1zrlKGrZ5-36izJB92doxOTNm-NWVxnsAlGzVECbgWMCDg154g-sypof8hCN7My6JXQ-Y815rGultkAID60rUgg4dsSMXiP5mWBqktUtKs-pwDwwWeRWpASdufTshkbwjxJzJsRpTFdJCRzgOpEeP7Z07IcFZE8vHb0tMWSLDJShOTtGjR3Dz881MrUbGoPvQv9Jg8DVNeKcQHSKKU7qa0e-zNGzBjULhd0mE4HZw.ygbdZZeyGiwm7LWt.NwFVXqKdHkl55Dn45TZgToblcbJWw6pACeAIetuSG4M-FY2ZSgpruEC-M9oktIqoRrhSShjyjLBmdrTaKUyj5k8WyF0xGR2T2rbZ9Mn9IFmNzzM0pNNfCvNAN5CpIUBNboX-L-_6DsAFAfekEkUBQYvArDhA8WE2pq7udUnr8u0n00MG1gcuT98mtSzovZCe1z57AdmItqazILYZuB-x.8IxWXoXOvzqtFh_fNn069A
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.FrcY-tGPQJXsnzxNagYAHJ3qfF7ky99nK_b_EkaSA41IfwQET70V0XTEyijloXxcknKIVtgyGK3ER5ciyjSg-kZdTd-tEsxl10GK_4gyhyqF4TYCnq_nD-mYuFV6TavVrzi0kojZAKVGEmD-gf3cMmQjViGL1TNeiDlaSkkpzaGMWK90XqQw434sqTvP4jYrmd9wJlQhRyrvUOh-PVsdncpAp9i3Q75av4G261qR8m_whiHV9npiBFaB8QBEoEZfhd23etguSStySjvyFwWVpYtKW8JGx4ObZtR7svOUHQJanSQxwKNKGjGg8DU8SfYm-T22yR5W7ovi0C8kkoLDIA.JsptLvDoaGfhqGvb.jhA_OACKn6mLjlSiLbn7Ut29KOYbNu6oxHSTSlRzZI210CuBHrxOKYfWZM_zq6ZirLpmRCW4d4D4hf_-UJ0glj9VKQWub16gXS67gVvMHVQOwGISYIWuywbj27WskwKl14bdcwL5xsY0y6YEbuecjx7savlbVbhcAaYfNCW-y8aHL8TqhE2vtF-X-M-Tsbzgmb27BZvJ5RJs3X1PmLfI.lZRskgG3PzXdE4JFnqT42A

autoload/vimlparser.vim

@@ -3773,12 +3773,14 @@ function! s:StringReader.__init__(lines)
   let self.buf = []
   let self.pos = []
   let lnum = 0
+  let offset = 0
   while lnum < len(a:lines)
     let col = 0
     for c in split(a:lines[lnum], '\zs')
       call add(self.buf, c)
-      call add(self.pos, [lnum + 1, col + 1])
+      call add(self.pos, [lnum + 1, col + 1, offset])
       let col += len(c)
+      let offset += len(c)
     endfor
     while lnum + 1 < len(a:lines) && a:lines[lnum + 1] =~# '^\s*\\'
       let skip = s:TRUE
@@ -3790,18 +3792,21 @@ function! s:StringReader.__init__(lines)
           endif
         else
           call add(self.buf, c)
-          call add(self.pos, [lnum + 2, col + 1])
+          call add(self.pos, [lnum + 2, col + 1, offset])
         endif
         let col += len(c)
+        let offset += len(c)
       endfor
       let lnum += 1
+      let offset += 1
     endwhile
     call add(self.buf, '<EOL>')
-    call add(self.pos, [lnum + 1, col + 1])
+    call add(self.pos, [lnum + 1, col + 1, offset])
     let lnum += 1
+    let offset += 1
   endwhile
   " for <EOF>
-  call add(self.pos, [lnum + 1, 0])
+  call add(self.pos, [lnum + 1, 0, offset])
   let self.i = 0
 endfunction
 
@@ -3895,8 +3900,8 @@ function! s:StringReader.getstr(begin, end)
 endfunction
 
 function! s:StringReader.getpos()
-  let [lnum, col] = self.pos[self.i]
-  return {'i': self.i, 'lnum': lnum, 'col': col}
+  let [lnum, col, offset] = self.pos[self.i]
+  return {'i': self.i, 'lnum': lnum, 'col': col, 'offset': offset}
 endfunction
 
 function! s:StringReader.setpos(pos)

go/export.go

@@ -467,7 +467,7 @@ func newPos(p *pos, filename string) *ast.Pos {
 		return nil
 	}
 	return &ast.Pos{
-		Offset:   p.i,
+		Offset:   p.offset,
 		Line:     p.lnum,
 		Column:   p.col,
 		Filename: filename,

go/type.go

@@ -86,9 +86,10 @@ type lhs struct {
 }
 
 type pos struct {
-	i    int
-	lnum int
-	col  int
+	i      int
+	lnum   int
+	col    int
+	offset int
 }
 
 // Node returns new VimNode.
@@ -192,13 +193,15 @@ func (self *StringReader) __init__(lines []string) {
 	self.buf = make([]string, 0, size)
 	self.pos = make([]pos, 0, size+1) // +1 for EOF
 	var lnum = 0
+	var offset = 0
 	for lnum < len(lines) {
 		var col = 0
 		for _, r := range lines[lnum] {
 			c := string(r)
 			self.buf = append(self.buf, c)
-			self.pos = append(self.pos, pos{lnum: lnum + 1, col: col + 1})
+			self.pos = append(self.pos, pos{lnum: lnum + 1, col: col + 1, offset: offset})
 			col += len(c)
+			offset += len(c)
 		}
 		for lnum+1 < len(lines) && viml_eqregh(lines[lnum+1], "^\\s*\\\\") {
 			var skip = true
@@ -214,15 +217,18 @@ func (self *StringReader) __init__(lines []string) {
 					self.pos = append(self.pos, pos{lnum: lnum + 2, col: col + 1})
 				}
 				col += len(c)
+				offset += len(c)
 			}
 			lnum += 1
+			offset += 1
 		}
 		self.buf = append(self.buf, "<EOL>")
-		self.pos = append(self.pos, pos{lnum: lnum + 1, col: col + 1})
+		self.pos = append(self.pos, pos{lnum: lnum + 1, col: col + 1, offset: offset})
 		lnum += 1
+		offset += 1
 	}
 	// for <EOF>
-	self.pos = append(self.pos, pos{lnum: lnum + 1, col: 0})
+	self.pos = append(self.pos, pos{lnum: lnum + 1, col: 0, offset: offset})
 	self.i = 0
 }
 

go/vimlparser_test.go

@@ -197,3 +197,43 @@ func testParseVimLParser(t testing.TB) {
 	n := NewVimLParser(false).parse(NewStringReader(lines))
 	c.compile(n)
 }
+
+func TestVimLParser_offset(t *testing.T) {
+	defer recovert(t)
+	const src = `
+
+function! F()
+  let x =
+\ 1
+
+  let x = "
+  \1
+	\2 <- tab
+  \3 マルチバイト
+  \4"
+endfunction
+
+" END
+`
+	const want = `function! F()
+  let x =
+\ 1
+
+  let x = "
+  \1
+	\2 <- tab
+  \3 マルチバイト
+  \4"
+endfunction`
+
+	n := NewVimLParser(false).parse(NewStringReader(strings.Split(src, "\n")))
+	f := n.body[0]
+	start := f.pos
+	end := f.endfunction.pos
+	endfExArg := f.endfunction.ea
+	end.offset += endfExArg.argpos.offset - endfExArg.cmdpos.offset
+
+	if got := src[start.offset:end.offset]; got != want {
+		t.Errorf("got:\n%v\nwant:\n%v", got, want)
+	}
+}