Skip to content

Support import option in fastscan #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doriable merged 1 commit into from
Apr 29, 2026
Merged

Support import option in fastscan #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions parser/fastscan/fastscan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ type Result struct {
type Import struct {
// Path of the imported file.
Path string
// Indicate if public or weak keyword was used in import statement.
IsPublic, IsWeak bool
// Indicate if public, weak, or option keyword was used in import statement.
// IsOption corresponds to the Editions 2024 "import option" syntax.
IsPublic, IsWeak, IsOption bool
}

// SyntaxError is returned from Scan when one or more syntax errors are observed.
Expand Down Expand Up @@ -96,9 +97,9 @@ func newSyntaxError(errs []reporter.ErrorWithPos) error {
func Scan(filename string, r io.Reader) (Result, error) {
var res Result

var currentImport []string // if non-nil, parsing an import statement
var isPublic, isWeak bool // if public or weak keyword observed in current import statement
var packageComponents []string // if non-nil, parsing a package statement
var currentImport []string // if non-nil, parsing an import statement
var isPublic, isWeak, isOption bool // if public, weak, or option keyword observed in current import statement
var packageComponents []string // if non-nil, parsing a package statement
var syntaxErrs []reporter.ErrorWithPos

// current stack of open blocks -- those starting with {, [, (, or < for
Expand Down Expand Up @@ -138,9 +139,10 @@ func Scan(filename string, r io.Reader) (Result, error) {
case stringToken:
currentImport = append(currentImport, text)
case identifierToken:
if len(currentImport) == 0 && (text == "public" || text == "weak") {
if len(currentImport) == 0 && (text == "public" || text == "weak" || text == "option") {
isPublic = text == "public"
isWeak = text == "weak"
isOption = text == "option"
break
}
fallthrough
Expand All @@ -156,6 +158,7 @@ func Scan(filename string, r io.Reader) (Result, error) {
Path: strings.Join(currentImport, ""),
IsPublic: isPublic,
IsWeak: isWeak,
IsOption: isOption,
})
} else {
syntaxErrs = append(syntaxErrs,
Expand Down Expand Up @@ -226,7 +229,7 @@ func Scan(filename string, r io.Reader) (Result, error) {
if declarationStart && len(contextStack) == 0 {
if text == "import" {
currentImport = []string{}
isPublic, isWeak = false, false
isPublic, isWeak, isOption = false, false, false
} else if text == "package" {
packageComponents = []string{}
}
Expand Down
15 changes: 15 additions & 0 deletions parser/fastscan/fastscan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,21 @@ func TestScan(t *testing.T) {
},
expectedPackage: "abc.xyz",
},
{
name: "option imports",
input: `edition = "2024";
package abc.xyz;
import "foo/bar/baz.proto";
import option "google/protobuf/cpp_features.proto";
import option "google/protobuf/java_features.proto";
`,
expectedImports: []Import{
{Path: "foo/bar/baz.proto"},
{Path: "google/protobuf/cpp_features.proto", IsOption: true},
{Path: "google/protobuf/java_features.proto", IsOption: true},
},
expectedPackage: "abc.xyz",
},
}
for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
Expand Down
Loading