Skip to content

Commit d76e9fb

Browse files
committed
update vendored gomacro to fix bug [gomacro#28](cosmos72/gomacro#28):
in 'import "path"' without an explicit name, use the name declared inside the package being imported, not paths.FileName(path)
1 parent b632224 commit d76e9fb

File tree

8 files changed

+56
-43
lines changed

8 files changed

+56
-43
lines changed

complete.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
interp "github.com/cosmos72/gomacro/fast"
5+
"github.com/cosmos72/gomacro/base"
56
)
67

78
type Completion struct {
@@ -36,7 +37,7 @@ func handleCompleteRequest(ir *interp.Interp, receipt msgReceipt) error {
3637
content["traceback"] = nil
3738
content["status"] = "error"
3839
} else {
39-
partialWord := interp.TailIdentifier(prefix)
40+
partialWord := base.TailIdentifier(prefix)
4041
content["cursor_start"] = float64(len(prefix) - len(partialWord))
4142
content["cursor_end"] = float64(cursorPos)
4243
content["matches"] = matches

vendor/github.com/cosmos72/gomacro/base/genimport.go

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cosmos72/gomacro/base/import_scanner.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cosmos72/gomacro/base/importer.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cosmos72/gomacro/base/string.go

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cosmos72/gomacro/classic/import.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cosmos72/gomacro/fast/import.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cosmos72/gomacro/fast/repl.go

Lines changed: 0 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)