Wrong tokenization of else statement for ifdef in Makefile

[alexr00]

Issue Type: Bug

In this Makefile sample "else" statement gets a wrong color:

a := 1
target:
ifdef a
	echo a
else
	echo b
endif

Originally from @foreignmeloman in microsoft/vscode#109008

Screenshot:

VS Code version: Code - Insiders 1.51.0-insider (13b3c937dc5e3816c79bdd2cdf2cdf6f9c727b75, 2020-10-20T06:07:53.466Z)
OS version: Windows_NT x64 10.0.18363

System Info

Item	Value
CPUs	Intel(R) Core(TM) i5-8400H CPU @ 2.50GHz (8 x 2496)
GPU Status	2d_canvas: enabled flash_3d: enabled flash_stage3d: enabled flash_stage3d_baseline: enabled gpu_compositing: enabled multiple_raster_threads: enabled_on oop_rasterization: disabled_off opengl: enabled_on protected_video_decode: enabled rasterization: enabled skia_renderer: disabled_off_ok video_decode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled
Load (avg)	undefined
Memory (System)	15.80GB (4.73GB free)
Process Argv	--crash-reporter-id b24ee7a9-a4c3-4313-b1c0-661cd65ffc34
Screen Reader	no
VM	0%

Extensions: none

[fadeevab]

Thanks for reporting. I'll check it out a bit later.

[fadeevab]

Fixed!

Hey, @alexr00, could you return unit-tests for Makefile into vscode repository back? Or could you say where they are. Thank you!

[alexr00]

The colorize test fixtures are back in the VS Code repo (ex. https://github.com/Microsoft/vscode/blob/af2bcd4d4612dc25f848a0a6a758507010401fa0/extensions/vscode-colorize-tests/test/colorize-fixtures/makefile#L1-L1).

The tests can be run same as always with https://github.com/Microsoft/vscode/blob/0e7f3d0d8cbc24b5c72b93838f3cb9be3a22d4ff/scripts/test-integration.sh

[fadeevab]

@alexr00 Your guys have to get back code review practices and other SDLC practices, as I see commits moving huge parts of source code here and there without any description and PR. Folks, you are Microsoft, come on! ;)

[foreignmeloman]

Thanks for the fix! So when will this be available?

[fadeevab]

@foreignmeloman Usually, we get the update with the very next VSCode release. The changes from this repo have to be pulled to https://github.com/microsoft/vscode/blob/master/extensions/make/syntaxes/make.tmLanguage.json by @alexr00 or somebody else from the VSCode team. Need just wait.

[alexr00]

@fadeevab I tried pulling in your changes, but I'm seeing some colorizing results that look unintended. Specifically, when a # is preceded by a tab then the line doesn't get tokenized as a comment. Example snippet:

	# "$$" in a shell means to escape makefile's variable substitution.

[fadeevab]

@alexr00 Yeah, I changed the behavior of comments colorizing in the scope of #4

This is because:

target:
# This is a comment of Makefile
<------># This is a comment of Bash, and it is not gonna be colorized. "Bash inside of Makefile" is a difficult deal.

@alexr00 I didn't update test because there was no test files at the moment of my patch. I can upgrade test cases later... Still, you can upgrade test results for now.

[fadeevab]

@alexr00 Or, if you need, we can wait until I upgrade test case results inside of your test system. What do you think?

[alexr00]

@fadeevab no need for you to update the tests, thank you though. I just wasn't sure if this was expected behavior.