// First word line\n' +
' | |
// Second line | |
// Third word line |
// First line\n' +
' | |
// Second word line | |
// Third line |
line 1
| |
line 2
| |
line 3 |
")] -fn index(q: Json) -> JsonValue { +fn syntect(q: Json ) -> JsonValue { // TODO(slimsag): In an ideal world we wouldn't be relying on catch_unwind // and instead Syntect would return Result types when failures occur. This // will require some non-trivial work upstream: // https://github.com/trishume/syntect/issues/98 - let result = panic::catch_unwind(|| highlight(q.into_inner())); + let result = std::panic::catch_unwind(|| sg_syntax::syntect_highlight(q.into_inner())); match result { Ok(v) => v, Err(_) => json!({"error": "panic while highlighting code", "code": "panic"}), } } -fn highlight(q: Query) -> JsonValue { - SYNTAX_SET.with(|syntax_set| { - // Determine syntax definition by extension. - let syntax_def = match determine_language(&q, syntax_set) { - Ok(v) => v, - Err(e) => return e, - }; - - if q.css { - let output = ClassedTableGenerator::new( - &syntax_set, - &syntax_def, - &q.code, - q.line_length_limit, - ClassStyle::SpacedPrefixed { prefix: "hl-" }, - ) - .generate(); - - json!({ - "data": output, - "plaintext": syntax_def.name == "Plain Text", - }) - } else { - // TODO(slimsag): return the theme's background color (and other info??) to caller? - // https://github.com/trishume/syntect/blob/c8b47758a3872d478c7fc740782cd468b2c0a96b/examples/synhtml.rs#L24 - - // Determine theme to use. - // - // TODO(slimsag): We could let the query specify the theme file's actual - // bytes? e.g. via `load_from_reader`. - let theme = match THEME_SET.themes.get(&q.theme) { - Some(v) => v, - None => return json!({"error": "invalid theme", "code": "invalid_theme"}), - }; - - json!({ - "data": highlighted_html_for_string(&q.code, &syntax_set, &syntax_def, theme), - "plaintext": syntax_def.name == "Plain Text", - }) - } - }) -} - -fn determine_language<'a>( - q: &Query, - syntax_set: &'a SyntaxSet, -) -> Result<&'a SyntaxReference, JsonValue> { - if q.filepath == "" { - // Legacy codepath, kept for backwards-compatability with old clients. - return match syntax_set.find_syntax_by_extension(&q.extension) { - Some(v) => Ok(v), - // Fall back: Determine syntax definition by first line. - None => match syntax_set.find_syntax_by_first_line(&q.code) { - Some(v) => Ok(v), - None => Err(json!({"error": "invalid extension"})), - }, - }; - } - - // Split the input path ("foo/myfile.go") into file name - // ("myfile.go") and extension ("go"). - let path = Path::new(&q.filepath); - let file_name = path.file_name().and_then(|n| n.to_str()).unwrap_or(""); - let extension = path.extension().and_then(|x| x.to_str()).unwrap_or(""); - - // Override syntect's language detection for conflicting file extensions because - // it's impossible to express this logic in a syntax definition. - struct Override { - extension: &'static str, - prefix_langs: Vec<(&'static str, &'static str)>, - default: &'static str, - } - let overrides = vec![Override { - extension: "cls", - prefix_langs: vec![("%", "TeX"), ("\\", "TeX")], - default: "Apex", - }]; - - if let Some(Override { - prefix_langs, - default, - .. - }) = overrides.iter().find(|o| o.extension == extension) - { - let name = match prefix_langs - .iter() - .find(|(prefix, _)| q.code.starts_with(prefix)) - { - Some((_, lang)) => lang, - None => default, - }; - return Ok(syntax_set - .find_syntax_by_name(name) - .unwrap_or_else(|| syntax_set.find_syntax_plain_text())); - } - - Ok(syntax_set - // First try to find a syntax whose "extension" matches our file - // name. This is done due to some syntaxes matching an "extension" - // that is actually a whole file name (e.g. "Dockerfile" or "CMakeLists.txt") - // see https://github.com/trishume/syntect/pull/170 - .find_syntax_by_extension(file_name) - .or_else(|| syntax_set.find_syntax_by_extension(extension)) - .or_else(|| syntax_set.find_syntax_by_first_line(&q.code)) - .unwrap_or_else(|| syntax_set.find_syntax_plain_text())) -} - -#[cfg(test)] -mod tests { - use syntect::parsing::SyntaxSet; - - use crate::{Query, determine_language}; - - #[test] - fn cls_tex() { - let syntax_set = SyntaxSet::load_defaults_newlines(); - let query = Query { - filepath: "foo.cls".to_string(), - code: "%".to_string(), - css: false, - line_length_limit: None, - extension: String::new(), - theme: String::new(), - }; - let result = determine_language(&query, &syntax_set); - assert_eq!(result.unwrap().name, "TeX"); - } - - #[test] - fn cls_apex() { - let syntax_set = SyntaxSet::load_defaults_newlines(); - let query = Query { - filepath: "foo.cls".to_string(), - code: "/**".to_string(), - css: false, - line_length_limit: None, - extension: String::new(), - theme: String::new(), - }; - let result = determine_language(&query, &syntax_set); - assert_eq!(result.unwrap().name, "Apex"); +#[post("/lsif", format = "application/json", data = " ")] +fn lsif(q: Json) -> JsonValue { + match sg_syntax::lsif_highlight(q.into_inner()) { + Ok(v) => v, + Err(err) => err, } } @@ -226,39 +37,15 @@ fn not_found() -> JsonValue { json!({"error": "resource not found", "code": "resource_not_found"}) } -fn list_features() { - // List embedded themes. - println!("## Embedded themes:"); - println!(""); - for t in THEME_SET.themes.keys() { - println!("- `{}`", t); - } - println!(""); - - // List supported file extensions. - SYNTAX_SET.with(|syntax_set| { - println!("## Supported file extensions:"); - println!(""); - for sd in syntax_set.syntaxes() { - println!("- {} (`{}`)", sd.name, sd.file_extensions.join("`, `")); - } - println!(""); - }); -} - #[launch] -fn rocket() -> rocket::Rocket { +fn rocket() -> _ { // Only list features if QUIET != "true" - match env::var("QUIET") { - Ok(v) => { - if v != "true" { - list_features() - } - } - Err(_) => list_features(), + match std::env::var("QUIET") { + Ok(v) if v == "true" => {} + _ => sg_syntax::list_features(), }; - rocket::ignite() - .mount("/", routes![index, health]) - .register(catchers![not_found]) + rocket::build() + .mount("/", routes![syntect, lsif, health]) + .register("/", catchers![not_found]) } diff --git a/go.mod b/go.mod index 905222aae2ec..3d221ed558df 100644 --- a/go.mod +++ b/go.mod @@ -137,7 +137,6 @@ require ( github.com/sourcegraph/go-langserver v2.0.1-0.20181108233942-4a51fa2e1238+incompatible github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d github.com/sourcegraph/go-rendezvous v0.0.0-20210910070954-ef39ade5591d - github.com/sourcegraph/gosyntect v0.0.0-20210422223331-645353f16ddc github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf github.com/sourcegraph/sourcegraph/enterprise/dev/ci/images v0.0.0-20220203145655-4d2a39d3038a github.com/sourcegraph/sourcegraph/lib v0.0.0-20220203145655-4d2a39d3038a @@ -270,7 +269,7 @@ require ( github.com/go-openapi/swag v0.21.1 // indirect github.com/go-openapi/validate v0.20.3 // indirect github.com/go-stack/stack v1.8.1 // indirect - github.com/gogo/protobuf v1.3.2 // indirect + github.com/gogo/protobuf v1.3.2 github.com/golang-jwt/jwt/v4 v4.2.0 github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20220128192902-513e8ac6eea1 // indirect diff --git a/go.sum b/go.sum index d27ae613e6ad..51452a2edfaf 100644 --- a/go.sum +++ b/go.sum @@ -1766,7 +1766,6 @@ github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mo github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= -github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -2010,8 +2009,6 @@ github.com/sourcegraph/gologin v1.0.2-0.20181110030308-c6f1b62954d8 h1:K7hzuWsJG github.com/sourcegraph/gologin v1.0.2-0.20181110030308-c6f1b62954d8/go.mod h1:0VfoEApmSPgPhnePllwhrB4vwCUkI0K0w8aueOgoJQI= github.com/sourcegraph/gosaml2 v0.6.1-0.20210128133756-84151d087b10 h1:lLSG41QZ5I81jSOakWLB1qEXZhJ65spo81f4SEd8Z20= github.com/sourcegraph/gosaml2 v0.6.1-0.20210128133756-84151d087b10/go.mod h1:CAOGXqoL6YYtu7kCSx69SZlbNZWbwUchYzOacZatJ3s= -github.com/sourcegraph/gosyntect v0.0.0-20210422223331-645353f16ddc h1:iaDqNUpXf8FKUzw1pZrA6NrpILji4OigouwD9OSyamo= -github.com/sourcegraph/gosyntect v0.0.0-20210422223331-645353f16ddc/go.mod h1:WiNJKgKTnR3psOIGzVZQjLqZjJZuoL3F8tCh25Uk8dU= github.com/sourcegraph/httpgzip v0.0.0-20211015085752-0bad89b3b4df h1:VaS8k40GiNVUxVx0ZUilU38NU6tWUHNQOX342DWtZUM= github.com/sourcegraph/httpgzip v0.0.0-20211015085752-0bad89b3b4df/go.mod h1:RqWagzxNGCvucQQC9vX6aps474LCCOgshDpUTTyb+O8= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI= diff --git a/internal/gosyntect/gosyntect.go b/internal/gosyntect/gosyntect.go new file mode 100644 index 000000000000..9a5679cd2057 --- /dev/null +++ b/internal/gosyntect/gosyntect.go @@ -0,0 +1,220 @@ +package gosyntect + +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "net/http" + "strings" + "time" + + "github.com/opentracing-contrib/go-stdlib/nethttp" + opentracing "github.com/opentracing/opentracing-go" + "github.com/sourcegraph/sourcegraph/lib/errors" +) + +// Query represents a code highlighting query to the syntect_server. +type Query struct { + // Filepath is the file path of the code. It can be the full file path, or + // just the name and extension. + // + // See: https://github.com/sourcegraph/syntect_server#supported-file-extensions + Filepath string `json:"filepath"` + + // Filetype is the language name. + Filetype string `json:"filetype"` + + // Theme is the color theme to use for highlighting. + // If CSS is true, theme is ignored. + // + // See https://github.com/sourcegraph/syntect_server#embedded-themes + Theme string `json:"theme"` + + // Code is the literal code to highlight. + Code string `json:"code"` + + // CSS causes results to be returned in HTML table format with CSS class + // names annotating the spans rather than inline styles. + // + // TODO: I think we can just delete this? And theme? We don't use these. + // Then we could remove themes from syntect as well. I don't think we + // have any use case for these anymore (and haven't for awhile). + CSS bool `json:"css"` + + // LineLengthLimit is the maximum length of line that will be highlighted if set. + // Defaults to no max if zero. + // If CSS is false, LineLengthLimit is ignored. + LineLengthLimit int `json:"line_length_limit,omitempty"` + + // StabilizeTimeout, if non-zero, overrides the default syntect_server + // http-server-stabilizer timeout of 10s. This is most useful when a user + // is requesting to highlight a very large file and is willing to wait + // longer, but it is important this not _always_ be a long duration because + // the worker's threads could get stuck at 100% CPU for this amount of + // time if the user's request ends up being a problematic one. + StabilizeTimeout time.Duration `json:"-"` + + // Tracer, if not nil, will be used to record opentracing spans associated with the query. + Tracer opentracing.Tracer +} + +// Response represents a response to a code highlighting query. +type Response struct { + // Data is the actual highlighted HTML version of Query.Code. + Data string + + // LSIF is the base64 encoded byte array of an LSIF Typed payload containing highlighting data. + LSIF string + + // Plaintext indicates whether or not a syntax could not be found for the + // file and instead it was rendered as plain text. + Plaintext bool +} + +var ( + // ErrInvalidTheme is returned when the Query.Theme is not a valid theme. + ErrInvalidTheme = errors.New("invalid theme") + + // ErrRequestTooLarge is returned when the request is too large for syntect_server to handle (e.g. file is too large to highlight). + ErrRequestTooLarge = errors.New("request too large") + + // ErrPanic occurs when syntect_server panics while highlighting code. This + // most often occurs when Syntect does not support e.g. an obscure or + // relatively unused sublime-syntax feature and as a result panics. + ErrPanic = errors.New("syntect panic while highlighting") + + // ErrHSSWorkerTimeout occurs when syntect_server's wrapper, + // http-server-stabilizer notices syntect_server is taking too long to + // serve a request, has most likely gotten stuck, and as such has been + // restarted. This occurs rarely on certain files syntect_server cannot yet + // handle for some reason. + ErrHSSWorkerTimeout = errors.New("HSS worker timeout while serving request") +) + +type response struct { + // Successful response fields. + Data string `json:"data"` + Plaintext bool `json:"plaintext"` + + // Error response fields. + Error string `json:"error"` + Code string `json:"code"` +} + +var supportedFiletypes = map[string]struct{}{ + "go": {}, +} + +// Client represents a client connection to a syntect_server. +type Client struct { + syntectServer string +} + +var client = &http.Client{Transport: &nethttp.Transport{}} + +func (c *Client) IsTreesitterSupported(filetype string) bool { + _, contained := supportedFiletypes[strings.ToLower(filetype)] + return contained +} + +// Highlight performs a query to highlight some code. +// +// TOOD(tjdevries): I think it would be good to remove `useTreeSitter` as a +// variable and instead use either two different callpaths or just +// automatically do this via the query or something else. It feels a bit goofy +// to be a separate param. But I need to clean up these other deprecated +// options later, so it's OK for the first iteration. +func (c *Client) Highlight(ctx context.Context, q *Query, useTreeSitter bool) (*Response, error) { + if useTreeSitter && !c.IsTreesitterSupported(q.Filetype) { + return nil, errors.New("Not a valid treesitter filetype") + } + + // Build the request. + jsonQuery, err := json.Marshal(q) + if err != nil { + return nil, errors.Wrap(err, "encoding query") + } + + var url string + if useTreeSitter { + url = "/lsif" + } else { + url = "/" + } + + req, err := http.NewRequest("POST", c.url(url), bytes.NewReader(jsonQuery)) + if err != nil { + return nil, errors.Wrap(err, "building request") + } + req.Header.Set("Content-Type", "application/json") + if q.StabilizeTimeout != 0 { + req.Header.Set("X-Stabilize-Timeout", q.StabilizeTimeout.String()) + } + + // Add tracing to the request. + tracer := q.Tracer + if tracer == nil { + tracer = opentracing.NoopTracer{} + } + req = req.WithContext(ctx) + req, ht := nethttp.TraceRequest(tracer, req, + nethttp.OperationName("Highlight"), + nethttp.ClientTrace(false)) + defer ht.Finish() + + // Perform the request. + resp, err := client.Do(req) + if err != nil { + return nil, errors.Wrap(err, fmt.Sprintf("making request to %s", c.url("/"))) + } + defer resp.Body.Close() + + if resp.StatusCode == http.StatusBadRequest { + return nil, ErrRequestTooLarge + } + + // Can only call ht.Span() after the request has been executed, so add our span tags in now. + ht.Span().SetTag("Filepath", q.Filepath) + ht.Span().SetTag("Theme", q.Theme) + ht.Span().SetTag("CSS", q.CSS) + + // Decode the response. + var r response + if err := json.NewDecoder(resp.Body).Decode(&r); err != nil { + return nil, errors.Wrap(err, fmt.Sprintf("decoding JSON response from %s", c.url("/"))) + } + if r.Error != "" { + var err error + switch r.Code { + case "invalid_theme": + err = ErrInvalidTheme + case "resource_not_found": + // resource_not_found is returned in the event of a 404, indicating a bug + // in gosyntect. + err = errors.New("gosyntect internal error: resource_not_found") + case "panic": + err = ErrPanic + case "hss_worker_timeout": + err = ErrHSSWorkerTimeout + default: + err = errors.Errorf("unknown error=%q code=%q", r.Error, r.Code) + } + return nil, errors.Wrap(err, c.syntectServer) + } + return &Response{ + Data: r.Data, + Plaintext: r.Plaintext, + }, nil +} + +func (c *Client) url(path string) string { + return c.syntectServer + path +} + +// New returns a client connection to a syntect_server. +func New(syntectServer string) *Client { + return &Client{ + syntectServer: strings.TrimSuffix(syntectServer, "/"), + } +} diff --git a/lib/codeintel/lsiftyped/lsif.pb.go b/lib/codeintel/lsiftyped/lsif.pb.go index ba0b3fe6ac0d..24aeccb254a8 100644 --- a/lib/codeintel/lsiftyped/lsif.pb.go +++ b/lib/codeintel/lsiftyped/lsif.pb.go @@ -199,148 +199,159 @@ type SyntaxKind int32 const ( SyntaxKind_UnspecifiedSyntaxKind SyntaxKind = 0 - // `+`, `*`, etc. - SyntaxKind_Operator SyntaxKind = 1 // Comment, including comment markers and text - SyntaxKind_Comment SyntaxKind = 2 + SyntaxKind_Comment SyntaxKind = 1 // `;` `.` `,` - SyntaxKind_PunctuationDelimiter SyntaxKind = 3 + SyntaxKind_PunctuationDelimiter SyntaxKind = 2 // (), {}, [] when used syntactically - SyntaxKind_PunctuationBracket SyntaxKind = 4 - // `{}` within a string. - SyntaxKind_PunctuationSpecial SyntaxKind = 5 + SyntaxKind_PunctuationBracket SyntaxKind = 3 // `if`, `else`, `return`, `class`, etc. - SyntaxKind_Keyword SyntaxKind = 6 - // non-specific variables, function calls, etc. - // In general, prefer more specific identifier kinds if possible. - SyntaxKind_Identifier SyntaxKind = 7 + SyntaxKind_IdentifierKeyword SyntaxKind = 4 + // `+`, `*`, etc. + SyntaxKind_IdentifierOperator SyntaxKind = 5 + // non-specific catch-all for any identifier not better described elsewhere + SyntaxKind_Identifier SyntaxKind = 6 // Identifiers builtin to the language: `min`, `print` in Python. - SyntaxKind_BuiltinIdentifier SyntaxKind = 8 - // Identifiers builtin to the language: `None` in Python, `nil` in Go. - SyntaxKind_NullIdentifier SyntaxKind = 9 + SyntaxKind_IdentifierBuiltin SyntaxKind = 7 + // Identifiers representing `null`-like values: `None` in Python, `nil` in Go. + SyntaxKind_IdentifierNull SyntaxKind = 8 // `xyz` in `const xyz = "hello"` - SyntaxKind_ConstantIdentifier SyntaxKind = 10 + SyntaxKind_IdentifierConstant SyntaxKind = 9 // `var X = "hello"` in Go - SyntaxKind_MutableGlobalIdentifier SyntaxKind = 11 + SyntaxKind_IdentifierMutableGlobal SyntaxKind = 10 // both parameter definition and references - SyntaxKind_ParameterIdentifier SyntaxKind = 12 + SyntaxKind_IdentifierParameter SyntaxKind = 11 // identifiers for variable definitions and references within a local scope - SyntaxKind_LocalIdentifier SyntaxKind = 13 + SyntaxKind_IdentifierLocal SyntaxKind = 12 // Used when identifier shadowes some other identifier within the scope - SyntaxKind_ShadowedIdentifier SyntaxKind = 14 + SyntaxKind_IdentifierShadowed SyntaxKind = 13 // `package main` - SyntaxKind_ModuleIdentifier SyntaxKind = 15 - // Macro references only, not definitions - SyntaxKind_MacroIdentifier SyntaxKind = 16 + SyntaxKind_IdentifierModule SyntaxKind = 14 + // Function call/reference + SyntaxKind_IdentifierFunction SyntaxKind = 15 + // Function definition only + SyntaxKind_IdentifierFunctionDefinition SyntaxKind = 16 + // Macro call/reference + SyntaxKind_IdentifierMacro SyntaxKind = 17 + // Macro definition only + SyntaxKind_IdentifierMacroDefinition SyntaxKind = 18 + // non-builtin types, including namespaces + SyntaxKind_IdentifierType SyntaxKind = 19 + // builtin types only, such as `str` for Python or `int` in Go + SyntaxKind_IdentifierBuiltinType SyntaxKind = 20 + // Python decorators, c-like __attribute__ + SyntaxKind_IdentifierAttribute SyntaxKind = 21 + // `\b` + SyntaxKind_RegexEscape SyntaxKind = 22 + // `*`, `+` + SyntaxKind_RegexRepeated SyntaxKind = 23 + // `.` + SyntaxKind_RegexWildcard SyntaxKind = 24 + // `(`, `)`, `[`, `]` + SyntaxKind_RegexDelimiter SyntaxKind = 25 + // `|`, `-` + SyntaxKind_RegexJoin SyntaxKind = 26 // Literal strings: "Hello, world!" - SyntaxKind_StringLiteral SyntaxKind = 17 - // ".*" in a string regex - SyntaxKind_StringLiteralRegex SyntaxKind = 18 - // "\t", "\n" - SyntaxKind_StringLiteralEscape SyntaxKind = 19 - // datetimes within strings, special words within a string - SyntaxKind_StringLiteralSpecial SyntaxKind = 20 - // "key" in { "key": "value" } - SyntaxKind_StringLiteralKey SyntaxKind = 21 + SyntaxKind_StringLiteral SyntaxKind = 27 + // non-regex escapes: "\t", "\n" + SyntaxKind_StringLiteralEscape SyntaxKind = 28 + // datetimes within strings, special words within a string, `{}` in format strings + SyntaxKind_StringLiteralSpecial SyntaxKind = 29 + // "key" in { "key": "value" }, useful for example in JSON + SyntaxKind_StringLiteralKey SyntaxKind = 30 // 'c' or similar, in languages that differentiate strings and characters - SyntaxKind_CharacterLiteral SyntaxKind = 22 + SyntaxKind_CharacterLiteral SyntaxKind = 31 // Literal numbers, both floats and integers - SyntaxKind_NumericLiteral SyntaxKind = 23 + SyntaxKind_NumericLiteral SyntaxKind = 32 // `true`, `false` - SyntaxKind_BooleanLiteral SyntaxKind = 24 - // Function definition only. - // Included because many editors highlight a function definition differently - // from function calls. - SyntaxKind_FunctionDefinition SyntaxKind = 25 - // Macro definition only. - // Included because many editors highlight a macro definition differently - // from macro usages. - SyntaxKind_MacroDefinition SyntaxKind = 26 - // non-builtin types, including namespaces - SyntaxKind_TypeIdentifier SyntaxKind = 27 - // builtin types only, such as `str` for Python or `int` in Go - SyntaxKind_BuiltinTypeIdentifier SyntaxKind = 28 - // Python decorators, c-like __attribute__ - SyntaxKind_AttributeIdentifier SyntaxKind = 29 + SyntaxKind_BooleanLiteral SyntaxKind = 33 // Used for XML-like tags - SyntaxKind_Tag SyntaxKind = 30 + SyntaxKind_Tag SyntaxKind = 34 // Attribute name in XML-like tags - SyntaxKind_TagAttribute SyntaxKind = 31 + SyntaxKind_TagAttribute SyntaxKind = 35 // Delimiters for XML-like tags - SyntaxKind_TagDelimiter SyntaxKind = 32 + SyntaxKind_TagDelimiter SyntaxKind = 36 ) // Enum value maps for SyntaxKind. var ( SyntaxKind_name = map[int32]string{ 0: "UnspecifiedSyntaxKind", - 1: "Operator", - 2: "Comment", - 3: "PunctuationDelimiter", - 4: "PunctuationBracket", - 5: "PunctuationSpecial", - 6: "Keyword", - 7: "Identifier", - 8: "BuiltinIdentifier", - 9: "NullIdentifier", - 10: "ConstantIdentifier", - 11: "MutableGlobalIdentifier", - 12: "ParameterIdentifier", - 13: "LocalIdentifier", - 14: "ShadowedIdentifier", - 15: "ModuleIdentifier", - 16: "MacroIdentifier", - 17: "StringLiteral", - 18: "StringLiteralRegex", - 19: "StringLiteralEscape", - 20: "StringLiteralSpecial", - 21: "StringLiteralKey", - 22: "CharacterLiteral", - 23: "NumericLiteral", - 24: "BooleanLiteral", - 25: "FunctionDefinition", - 26: "MacroDefinition", - 27: "TypeIdentifier", - 28: "BuiltinTypeIdentifier", - 29: "AttributeIdentifier", - 30: "Tag", - 31: "TagAttribute", - 32: "TagDelimiter", + 1: "Comment", + 2: "PunctuationDelimiter", + 3: "PunctuationBracket", + 4: "IdentifierKeyword", + 5: "IdentifierOperator", + 6: "Identifier", + 7: "IdentifierBuiltin", + 8: "IdentifierNull", + 9: "IdentifierConstant", + 10: "IdentifierMutableGlobal", + 11: "IdentifierParameter", + 12: "IdentifierLocal", + 13: "IdentifierShadowed", + 14: "IdentifierModule", + 15: "IdentifierFunction", + 16: "IdentifierFunctionDefinition", + 17: "IdentifierMacro", + 18: "IdentifierMacroDefinition", + 19: "IdentifierType", + 20: "IdentifierBuiltinType", + 21: "IdentifierAttribute", + 22: "RegexEscape", + 23: "RegexRepeated", + 24: "RegexWildcard", + 25: "RegexDelimiter", + 26: "RegexJoin", + 27: "StringLiteral", + 28: "StringLiteralEscape", + 29: "StringLiteralSpecial", + 30: "StringLiteralKey", + 31: "CharacterLiteral", + 32: "NumericLiteral", + 33: "BooleanLiteral", + 34: "Tag", + 35: "TagAttribute", + 36: "TagDelimiter", } SyntaxKind_value = map[string]int32{ - "UnspecifiedSyntaxKind": 0, - "Operator": 1, - "Comment": 2, - "PunctuationDelimiter": 3, - "PunctuationBracket": 4, - "PunctuationSpecial": 5, - "Keyword": 6, - "Identifier": 7, - "BuiltinIdentifier": 8, - "NullIdentifier": 9, - "ConstantIdentifier": 10, - "MutableGlobalIdentifier": 11, - "ParameterIdentifier": 12, - "LocalIdentifier": 13, - "ShadowedIdentifier": 14, - "ModuleIdentifier": 15, - "MacroIdentifier": 16, - "StringLiteral": 17, - "StringLiteralRegex": 18, - "StringLiteralEscape": 19, - "StringLiteralSpecial": 20, - "StringLiteralKey": 21, - "CharacterLiteral": 22, - "NumericLiteral": 23, - "BooleanLiteral": 24, - "FunctionDefinition": 25, - "MacroDefinition": 26, - "TypeIdentifier": 27, - "BuiltinTypeIdentifier": 28, - "AttributeIdentifier": 29, - "Tag": 30, - "TagAttribute": 31, - "TagDelimiter": 32, + "UnspecifiedSyntaxKind": 0, + "Comment": 1, + "PunctuationDelimiter": 2, + "PunctuationBracket": 3, + "IdentifierKeyword": 4, + "IdentifierOperator": 5, + "Identifier": 6, + "IdentifierBuiltin": 7, + "IdentifierNull": 8, + "IdentifierConstant": 9, + "IdentifierMutableGlobal": 10, + "IdentifierParameter": 11, + "IdentifierLocal": 12, + "IdentifierShadowed": 13, + "IdentifierModule": 14, + "IdentifierFunction": 15, + "IdentifierFunctionDefinition": 16, + "IdentifierMacro": 17, + "IdentifierMacroDefinition": 18, + "IdentifierType": 19, + "IdentifierBuiltinType": 20, + "IdentifierAttribute": 21, + "RegexEscape": 22, + "RegexRepeated": 23, + "RegexWildcard": 24, + "RegexDelimiter": 25, + "RegexJoin": 26, + "StringLiteral": 27, + "StringLiteralEscape": 28, + "StringLiteralSpecial": 29, + "StringLiteralKey": 30, + "CharacterLiteral": 31, + "NumericLiteral": 32, + "BooleanLiteral": 33, + "Tag": 34, + "TagAttribute": 35, + "TagDelimiter": 36, } ) @@ -1585,67 +1596,73 @@ var file_lib_codeintel_lsiftyped_lsif_proto_rawDesc = []byte{ 0x65, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x52, 0x65, 0x61, 0x64, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x08, 0x12, 0x0d, 0x0a, 0x09, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x10, 0x10, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x65, 0x73, 0x74, - 0x10, 0x20, 0x2a, 0xce, 0x05, 0x0a, 0x0a, 0x53, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x4b, 0x69, 0x6e, + 0x10, 0x20, 0x2a, 0xb8, 0x06, 0x0a, 0x0a, 0x53, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x19, 0x0a, 0x15, 0x55, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x53, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x4b, 0x69, 0x6e, 0x64, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, - 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x02, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x75, 0x6e, 0x63, 0x74, - 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x10, - 0x03, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x42, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x75, 0x6e, - 0x63, 0x74, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x10, - 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x10, 0x06, 0x12, 0x0e, - 0x0a, 0x0a, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x07, 0x12, 0x15, - 0x0a, 0x11, 0x42, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, - 0x69, 0x65, 0x72, 0x10, 0x08, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x75, 0x6c, 0x6c, 0x49, 0x64, 0x65, - 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x09, 0x12, 0x16, 0x0a, 0x12, 0x43, 0x6f, 0x6e, - 0x73, 0x74, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, - 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4d, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x47, 0x6c, 0x6f, 0x62, - 0x61, 0x6c, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x0b, 0x12, 0x17, - 0x0a, 0x13, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x49, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x0c, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x6f, 0x63, 0x61, 0x6c, - 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x0d, 0x12, 0x16, 0x0a, 0x12, - 0x53, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, - 0x65, 0x72, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x49, 0x64, - 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x0f, 0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x61, - 0x63, 0x72, 0x6f, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x10, 0x12, - 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, - 0x10, 0x11, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, 0x65, - 0x72, 0x61, 0x6c, 0x52, 0x65, 0x67, 0x65, 0x78, 0x10, 0x12, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x45, 0x73, 0x63, 0x61, 0x70, - 0x65, 0x10, 0x13, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, - 0x65, 0x72, 0x61, 0x6c, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x10, 0x14, 0x12, 0x14, 0x0a, - 0x10, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x4b, 0x65, - 0x79, 0x10, 0x15, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, - 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x10, 0x16, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x75, 0x6d, - 0x65, 0x72, 0x69, 0x63, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x10, 0x17, 0x12, 0x12, 0x0a, - 0x0e, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x10, - 0x18, 0x12, 0x16, 0x0a, 0x12, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x66, - 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x19, 0x12, 0x13, 0x0a, 0x0f, 0x4d, 0x61, 0x63, - 0x72, 0x6f, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x1a, 0x12, 0x12, - 0x0a, 0x0e, 0x54, 0x79, 0x70, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, - 0x10, 0x1b, 0x12, 0x19, 0x0a, 0x15, 0x42, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x54, 0x79, 0x70, - 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x1c, 0x12, 0x17, 0x0a, - 0x13, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x66, 0x69, 0x65, 0x72, 0x10, 0x1d, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x10, 0x1e, 0x12, - 0x10, 0x0a, 0x0c, 0x54, 0x61, 0x67, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x10, - 0x1f, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x61, 0x67, 0x44, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, - 0x72, 0x10, 0x20, 0x2a, 0x56, 0x0a, 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, - 0x17, 0x0a, 0x13, 0x55, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x53, 0x65, - 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, - 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, - 0x03, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x69, 0x6e, 0x74, 0x10, 0x04, 0x2a, 0x4e, 0x0a, 0x0d, 0x44, - 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x54, 0x61, 0x67, 0x12, 0x1c, 0x0a, 0x18, - 0x55, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x44, 0x69, 0x61, 0x67, 0x6e, - 0x6f, 0x73, 0x74, 0x69, 0x63, 0x54, 0x61, 0x67, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x6e, - 0x6e, 0x65, 0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, - 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x10, 0x02, 0x42, 0x3d, 0x5a, 0x3b, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x2f, 0x6c, 0x69, 0x62, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x6c, 0x2f, - 0x6c, 0x73, 0x69, 0x66, 0x74, 0x79, 0x70, 0x65, 0x64, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x53, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x4b, 0x69, 0x6e, 0x64, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x75, 0x6e, + 0x63, 0x74, 0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, + 0x72, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x50, 0x75, 0x6e, 0x63, 0x74, 0x75, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x42, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x10, 0x03, 0x12, 0x15, 0x0a, 0x11, 0x49, + 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, + 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, + 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x10, 0x06, 0x12, 0x15, 0x0a, 0x11, 0x49, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x10, + 0x07, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4e, + 0x75, 0x6c, 0x6c, 0x10, 0x08, 0x12, 0x16, 0x0a, 0x12, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, + 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x10, 0x09, 0x12, 0x1b, 0x0a, + 0x17, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x47, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x10, 0x0a, 0x12, 0x17, 0x0a, 0x13, 0x49, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, + 0x72, 0x10, 0x0b, 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, + 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x10, 0x0c, 0x12, 0x16, 0x0a, 0x12, 0x49, 0x64, 0x65, 0x6e, + 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x53, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x65, 0x64, 0x10, 0x0d, + 0x12, 0x14, 0x0a, 0x10, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x10, 0x0e, 0x12, 0x16, 0x0a, 0x12, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x66, 0x69, 0x65, 0x72, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x0f, 0x12, 0x20, + 0x0a, 0x1c, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x46, 0x75, 0x6e, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x10, + 0x12, 0x13, 0x0a, 0x0f, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x4d, 0x61, + 0x63, 0x72, 0x6f, 0x10, 0x11, 0x12, 0x1d, 0x0a, 0x19, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, + 0x69, 0x65, 0x72, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x10, 0x12, 0x12, 0x12, 0x0a, 0x0e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, + 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x10, 0x13, 0x12, 0x19, 0x0a, 0x15, 0x49, 0x64, 0x65, 0x6e, + 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x54, 0x79, 0x70, + 0x65, 0x10, 0x14, 0x12, 0x17, 0x0a, 0x13, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, + 0x72, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x10, 0x15, 0x12, 0x0f, 0x0a, 0x0b, + 0x52, 0x65, 0x67, 0x65, 0x78, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 0x10, 0x16, 0x12, 0x11, 0x0a, + 0x0d, 0x52, 0x65, 0x67, 0x65, 0x78, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x10, 0x17, + 0x12, 0x11, 0x0a, 0x0d, 0x52, 0x65, 0x67, 0x65, 0x78, 0x57, 0x69, 0x6c, 0x64, 0x63, 0x61, 0x72, + 0x64, 0x10, 0x18, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x65, 0x67, 0x65, 0x78, 0x44, 0x65, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x65, 0x72, 0x10, 0x19, 0x12, 0x0d, 0x0a, 0x09, 0x52, 0x65, 0x67, 0x65, 0x78, + 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0x1a, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, + 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x10, 0x1b, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x74, 0x72, + 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65, + 0x10, 0x1c, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, 0x65, + 0x72, 0x61, 0x6c, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x10, 0x1d, 0x12, 0x14, 0x0a, 0x10, + 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x4b, 0x65, 0x79, + 0x10, 0x1e, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x4c, + 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x10, 0x1f, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x75, 0x6d, 0x65, + 0x72, 0x69, 0x63, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x10, 0x20, 0x12, 0x12, 0x0a, 0x0e, + 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x10, 0x21, + 0x12, 0x07, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x10, 0x22, 0x12, 0x10, 0x0a, 0x0c, 0x54, 0x61, 0x67, + 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x10, 0x23, 0x12, 0x10, 0x0a, 0x0c, 0x54, + 0x61, 0x67, 0x44, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x10, 0x24, 0x2a, 0x56, 0x0a, + 0x08, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x17, 0x0a, 0x13, 0x55, 0x6e, 0x73, + 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, + 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x12, 0x0b, 0x0a, + 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x02, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, + 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x48, + 0x69, 0x6e, 0x74, 0x10, 0x04, 0x2a, 0x4e, 0x0a, 0x0d, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, + 0x74, 0x69, 0x63, 0x54, 0x61, 0x67, 0x12, 0x1c, 0x0a, 0x18, 0x55, 0x6e, 0x73, 0x70, 0x65, 0x63, + 0x69, 0x66, 0x69, 0x65, 0x64, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x54, + 0x61, 0x67, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x6e, 0x6e, 0x65, 0x63, 0x65, 0x73, 0x73, + 0x61, 0x72, 0x79, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, + 0x74, 0x65, 0x64, 0x10, 0x02, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x6c, 0x69, 0x62, 0x2f, + 0x63, 0x6f, 0x64, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x6c, 0x2f, 0x6c, 0x73, 0x69, 0x66, 0x74, 0x79, + 0x70, 0x65, 0x64, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/lib/codeintel/lsiftyped/lsif.ts b/lib/codeintel/lsiftyped/lsif.ts index 192eba59f197..edaff58fef06 100644 --- a/lib/codeintel/lsiftyped/lsif.ts +++ b/lib/codeintel/lsiftyped/lsif.ts @@ -25,38 +25,42 @@ export namespace lib.codeintel.lsiftyped { } export enum SyntaxKind { UnspecifiedSyntaxKind = 0, - Operator = 1, - Comment = 2, - PunctuationDelimiter = 3, - PunctuationBracket = 4, - PunctuationSpecial = 5, - Keyword = 6, - Identifier = 7, - BuiltinIdentifier = 8, - NullIdentifier = 9, - ConstantIdentifier = 10, - MutableGlobalIdentifier = 11, - ParameterIdentifier = 12, - LocalIdentifier = 13, - ShadowedIdentifier = 14, - ModuleIdentifier = 15, - MacroIdentifier = 16, - StringLiteral = 17, - StringLiteralRegex = 18, - StringLiteralEscape = 19, - StringLiteralSpecial = 20, - StringLiteralKey = 21, - CharacterLiteral = 22, - NumericLiteral = 23, - BooleanLiteral = 24, - FunctionDefinition = 25, - MacroDefinition = 26, - TypeIdentifier = 27, - BuiltinTypeIdentifier = 28, - AttributeIdentifier = 29, - Tag = 30, - TagAttribute = 31, - TagDelimiter = 32 + Comment = 1, + PunctuationDelimiter = 2, + PunctuationBracket = 3, + IdentifierKeyword = 4, + IdentifierOperator = 5, + Identifier = 6, + IdentifierBuiltin = 7, + IdentifierNull = 8, + IdentifierConstant = 9, + IdentifierMutableGlobal = 10, + IdentifierParameter = 11, + IdentifierLocal = 12, + IdentifierShadowed = 13, + IdentifierModule = 14, + IdentifierFunction = 15, + IdentifierFunctionDefinition = 16, + IdentifierMacro = 17, + IdentifierMacroDefinition = 18, + IdentifierType = 19, + IdentifierBuiltinType = 20, + IdentifierAttribute = 21, + RegexEscape = 22, + RegexRepeated = 23, + RegexWildcard = 24, + RegexDelimiter = 25, + RegexJoin = 26, + StringLiteral = 27, + StringLiteralEscape = 28, + StringLiteralSpecial = 29, + StringLiteralKey = 30, + CharacterLiteral = 31, + NumericLiteral = 32, + BooleanLiteral = 33, + Tag = 34, + TagAttribute = 35, + TagDelimiter = 36 } export enum Severity { UnspecifiedSeverity = 0, diff --git a/proto/lib/codeintel/lsiftyped/lsif.proto b/proto/lib/codeintel/lsiftyped/lsif.proto index e2c9f35f0718..4d214a226ef7 100644 --- a/proto/lib/codeintel/lsiftyped/lsif.proto +++ b/proto/lib/codeintel/lsiftyped/lsif.proto @@ -216,84 +216,89 @@ enum SymbolRole { enum SyntaxKind { UnspecifiedSyntaxKind = 0; - // `+`, `*`, etc. - Operator = 1; - // Comment, including comment markers and text - Comment = 2; + Comment = 1; // `;` `.` `,` - PunctuationDelimiter = 3; + PunctuationDelimiter = 2; // (), {}, [] when used syntactically - PunctuationBracket = 4; - // `{}` within a string. - PunctuationSpecial = 5; + PunctuationBracket = 3; // `if`, `else`, `return`, `class`, etc. - Keyword = 6; + IdentifierKeyword = 4; + + // `+`, `*`, etc. + IdentifierOperator = 5; - // non-specific variables, function calls, etc. - // In general, prefer more specific identifier kinds if possible. - Identifier = 7; + // non-specific catch-all for any identifier not better described elsewhere + Identifier = 6; // Identifiers builtin to the language: `min`, `print` in Python. - BuiltinIdentifier = 8; - // Identifiers builtin to the language: `None` in Python, `nil` in Go. - NullIdentifier = 9; + IdentifierBuiltin = 7; + // Identifiers representing `null`-like values: `None` in Python, `nil` in Go. + IdentifierNull = 8; // `xyz` in `const xyz = "hello"` - ConstantIdentifier = 10; + IdentifierConstant = 9; // `var X = "hello"` in Go - MutableGlobalIdentifier = 11; + IdentifierMutableGlobal = 10; // both parameter definition and references - ParameterIdentifier = 12; + IdentifierParameter = 11; // identifiers for variable definitions and references within a local scope - LocalIdentifier = 13; + IdentifierLocal = 12; // Used when identifier shadowes some other identifier within the scope - ShadowedIdentifier = 14; + IdentifierShadowed = 13; // `package main` - ModuleIdentifier = 15; - // Macro references only, not definitions - MacroIdentifier = 16; + IdentifierModule = 14; - // Literal strings: "Hello, world!" - StringLiteral = 17; - // ".*" in a string regex - StringLiteralRegex = 18; - // "\t", "\n" - StringLiteralEscape = 19; - // datetimes within strings, special words within a string - StringLiteralSpecial = 20; - // "key" in { "key": "value" } - StringLiteralKey = 21; - // 'c' or similar, in languages that differentiate strings and characters - CharacterLiteral = 22; - // Literal numbers, both floats and integers - NumericLiteral = 23; - // `true`, `false` - BooleanLiteral = 24; + // Function call/reference + IdentifierFunction = 15; + // Function definition only + IdentifierFunctionDefinition = 16; - // Function definition only. - // Included because many editors highlight a function definition differently - // from function calls. - FunctionDefinition = 25; - // Macro definition only. - // Included because many editors highlight a macro definition differently - // from macro usages. - MacroDefinition = 26; + // Macro call/reference + IdentifierMacro = 17; + // Macro definition only + IdentifierMacroDefinition = 18; // non-builtin types, including namespaces - TypeIdentifier = 27; + IdentifierType = 19; // builtin types only, such as `str` for Python or `int` in Go - BuiltinTypeIdentifier = 28; + IdentifierBuiltinType = 20; // Python decorators, c-like __attribute__ - AttributeIdentifier = 29; + IdentifierAttribute = 21; + + // `\b` + RegexEscape = 22; + // `*`, `+` + RegexRepeated = 23; + // `.` + RegexWildcard = 24; + // `(`, `)`, `[`, `]` + RegexDelimiter = 25; + // `|`, `-` + RegexJoin = 26; + + // Literal strings: "Hello, world!" + StringLiteral = 27; + // non-regex escapes: "\t", "\n" + StringLiteralEscape = 28; + // datetimes within strings, special words within a string, `{}` in format strings + StringLiteralSpecial = 29; + // "key" in { "key": "value" }, useful for example in JSON + StringLiteralKey = 30; + // 'c' or similar, in languages that differentiate strings and characters + CharacterLiteral = 31; + // Literal numbers, both floats and integers + NumericLiteral = 32; + // `true`, `false` + BooleanLiteral = 33; // Used for XML-like tags - Tag = 30; + Tag = 34; // Attribute name in XML-like tags - TagAttribute = 31; + TagAttribute = 35; // Delimiters for XML-like tags - TagDelimiter = 32; + TagDelimiter = 36; } // Occurrence associates a source position with a symbol and/or highlighting diff --git a/schema/schema.go b/schema/schema.go index 176c0f441493..87e09e98cb3d 100644 --- a/schema/schema.go +++ b/schema/schema.go @@ -1617,6 +1617,8 @@ type SettingsExperimentalFeatures struct { ShowSearchContextManagement *bool `json:"showSearchContextManagement,omitempty"` // ShowSearchNotebook description: Enables the search notebook at search/notebook ShowSearchNotebook *bool `json:"showSearchNotebook,omitempty"` + // TreeSitterEnabled description: Enables tree sitter for enabled filetypes + TreeSitterEnabled *bool `json:"treeSitterEnabled,omitempty"` } // SiteConfiguration description: Configuration for a Sourcegraph site. diff --git a/schema/settings.schema.json b/schema/settings.schema.json index 383362e1db5a..c557c2800827 100644 --- a/schema/settings.schema.json +++ b/schema/settings.schema.json @@ -198,6 +198,14 @@ "pointer": true } }, + "treeSitterEnabled": { + "description": "Enables tree sitter for enabled filetypes", + "type": "boolean", + "default": false, + "!go": { + "pointer": true + } + }, "batchChangesExecution": { "description": "Enables/disables the Batch Changes server side execution feature.", "type": "boolean",