Incorrect solidity grammar highlighting problems

[cyberthirst]

The grammar used in the extension doesn't correctly highlight symbols if they are followed by curly braces {}.

Examples for reproduction:

.deposit{ value: amount }();
new Tester{ salt: salt }(..);

[michprev]

Another example (taken from https://docs.soliditylang.org/en/v0.8.15/assembly.html#access-to-external-variables-functions-and-libraries):

// SPDX-License-Identifier: GPL-3.0
pragma solidity >=0.8.10 <0.9.0;

contract C {
    // Assigns a new selector and address to the return variable @fun
    function combineToFunctionPointer(address newAddress, uint newSelector) public pure returns (function() external fun) {
        assembly {
            fun.selector := newSelector
            fun.address  := newAddress
        }
    }
}

address in the func.address expression should not be highlighted.

[michprev]

virtual, override in a modifier definition

[michprev]

[cyberthirst]

incorrect highlighting of variable name hash in variable declaration:

[cyberthirst]

payable is not highlighted when used in format: address payable addr

[honzaprevratil]

1. Function argument mapping(...) storage X causes other function arguments and comments to be yellow (line 11 to line 13 - highlighting does not work), until the beginning of the function.

2. The comment in the place where modifiers are expected is yellow (line 19)

Printscreen of problem:

Code (here in GitHub's highlighting it works):

contract Highlighting {

    mapping(address account => uint256 tokensA) public claimedATokens;
    mapping(address account => uint256 tokensB) public claimedBTokens;

    function _claimTokens(
        uint256 bonus, // syntax highligting works here
        mapping(address => uint256) storage _tokenMapping, //this line brokes syntax highlighting
        address account, //not working
        uint256 amountToClaim //not working
    )  internal { // from here it is working again
        // some more common code
        _tokenMapping[account] = _tokenMapping[account] + amountToClaim + bonus;
    }

    function claimATokens(address account, uint256 amountToClaim /*green coment*/) external /*yellow coment?*/ {
        // ... code specif for A ...
        _claimTokens(0, claimedATokens, account, amountToClaim);
    }

    function claimBTokens(address account, uint256 amountToClaim) external {
        // ... code specif for B ...
        _claimTokens(1, claimedBTokens, account, amountToClaim);
    }
}