First round of language_make improvements

[Guldoman]

Next thing to add is ${...}, $(...).

Related to #563.

@PerilousBooklet what do you think about this? It should fix the issue you found.

[PerilousBooklet]

There's a problem with the :: that follow a target's name:

I think we should color that like it was before, completely blue.

[PerilousBooklet]

Also wouldn't it be better to color the special targets (es. .PHONY:) with operator instead of literal? That's what VSCode does. Personally I would prefer to use function, just like with normal targets (es. all: or all::).

[Guldoman]

There's a problem with the :: that follow a target's name:

Didn't know that was a thing, we can definitely add that to the regexes for target definition.

Also wouldn't it be better to color the special targets (es. .PHONY:) with operator instead of literal

Targets with a . in front of them are highlighted as keyword2, as you can see in your screenshot.
literal is used for assignments.

[PerilousBooklet]

Also versioned numbers like v1.2.3 should be colored. This %f[%w_]v?[%d%.]+%f[^%w_] should do the trick.
Basically just add v? between %f[%w_] and [%d%.]+%f[^%w_].

[Guldoman]

Also versioned numbers like v1.2.3 should be colored. This %f[%w_]v?[%d%.]+%f[^%w_] should do the trick. Basically just add v? between %f[%w_] and [%d%.]+%f[^%w_].

To be honest I would just remove that rule, and simply match numbers by themselves.

In general this syntax needs a lot of work, but we can at least properly highlight rules and assignments

[PerilousBooklet]

By the way, which existing reference are we going to use? VSCode? Or do we just use Make's syntax reference?

[Guldoman]

For the moment I'm just looking at https://www.gnu.org/software/make/manual/make.html and https://www.gnu.org/software/make/manual/html_node/Quick-Reference.html.

[PerilousBooklet]

Ok, great!

[PerilousBooklet]

Also versioned numbers like v1.2.3 should be colored. This %f[%w_]v?[%d%.]+%f[^%w_] should do the trick. Basically just add v? between %f[%w_] and [%d%.]+%f[^%w_].

To be honest I would just remove that rule, and simply match numbers by themselves.

In general this syntax needs a lot of work, but we can at least properly highlight rules and assignments

So you would remove { pattern = "%f[%w_]v?[%d%.]+%f[^%w_]", type = "number" }, and maybe replace it with { pattern = "v?[%d.?]+", type = "number" }, ?

[PerilousBooklet]

Also we should add the language syntax references header comment:

-- Language Syntax References
-- https://www.gnu.org/software/make/manual/make.html
-- https://www.gnu.org/software/make/manual/html_node/Quick-Reference.html

right below

-- mod-version:3
local syntax = require "core.syntax"

[PerilousBooklet]

I'm working on { pattern = "%$%(.-%)", type = "keyword2" }, and { pattern = "%$%{.-%}", type = "keyword2" },, for $(...) and ${...}, but they're not complete yet.
Postponed to a later date.

[PerilousBooklet]

So, the following should have all modifications:

-- mod-version:3
local syntax = require "core.syntax"

-- Language Syntax References
-- https://www.gnu.org/software/make/manual/make.html
-- https://www.gnu.org/software/make/manual/html_node/Quick-Reference.html

syntax.add {
  name = "Makefile",
  files = { PATHSEP .. "[Mm]akefile$", "%.mk$" },
  comment = "#",
  patterns = {
    { pattern = "#.*",                    type = "comment"  },
    { pattern = [[\.]],                   type = "normal"   },
    { pattern = "$[@^<%%?+|*]",           type = "keyword2" },
    { pattern = "$%(.-%)",                type = "symbol"   },
    { pattern = "v?[%d.?]+",              type = "number"   },
    { regex = [[^\s*+[^:#=\s]+\s*+()(?::{1,3}|[?+!])?=]], type = { "literal", "operator" } },
    { regex = [[^\s*+\.[^:=]+\s*+()::?]], type = { "keyword2", "operator" } },
    { regex = [[^\s*+[^:=]+\s*+()::?]],   type = { "function", "operator" } },
    { pattern = "-?[^%s:#=+?!]+%f[%s]",   type = "normal"   },
  },
  symbols = {
    ["define"] = "keyword",
    ["endef"] = "keyword",
    ["undefine"] = "keyword",
    ["ifdef"] = "keyword",
    ["ifndef"] = "keyword",
    ["ifeq"] = "keyword",
    ["ifneq"] = "keyword",
    ["else"] = "keyword",
    ["endif"] = "keyword",
    ["include"] = "keyword",
    ["-include"] = "keyword",
    ["sinclude"] = "keyword",
    ["override"] = "keyword",
    ["export"] = "keyword",
    ["unexport"] = "keyword",
    ["private"] = "keyword",
    ["vpath"] = "keyword",
  },
}

[PerilousBooklet]

Actually the .PHONY: target doesn't get matched with the code above.