Commit Graph

15261 Commits

Author SHA1 Message Date
a8f16503e2 Add backslash escaping to new link format
For users to be able to add square brackets inside of links using
the new format, the regular expression used for parsing those links
contained a balancing group, which can be used for matching pairs
of tokens (in this case, opening and closing brackets, in that order).
However, this means that users could not post links with unmatched
brackets inside of them (ie. ones that contain single brackets, or
a closing bracket and then an opening one). Allow for escaping opening
and closing brackets using the backslash character.

The change substitutes this old fragment of the regex in the display
text group:

    [^\[\]]*        // any character other than closing/opening bracket

for this one:

    (((?<=\\)[\[\]])|[^\[\]])*

The second pattern in the alternative remains the same; the first one
performs the escaping, as follows:

    (
        (?<=\\)     // positive lookbehind expression:
                    // this match will succeed, if the next expression
                    // is preceded by a single backslash
        [\[\]]      // either an opening or closing brace
    )

Since the entire display group is matched, unfortunately the lookbehind
expression does not actually strip the backslashes, so they are
manually stripped in handleMatches.

As demonstrated in the unit tests attached, this also allows balanced
brackets to be mixed with escaped ones.
2019-09-03 23:18:39 +02:00
53fe290ef3 Merge branch 'master' into back-button-part-2 2019-09-03 19:44:30 +09:00
4b2cb8854e Fix storyboard samples not stopping on exit 2019-09-03 19:28:10 +09:00
e98059267d Improve xmldoc 2019-09-03 19:21:24 +09:00
299d528654 Simplify implementation 2019-09-03 19:20:23 +09:00
e88965b433 Merge remote-tracking branch 'upstream/master' into consistent-mod-button-sounds 2019-09-03 19:18:59 +09:00
609adf4b59 Fix catch catcher lookups (#5964)
Fix catch catcher lookups

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-03 19:08:49 +09:00
f58ca82398 Don't include section for now 2019-09-03 18:56:01 +09:00
312e12e3b4 Add spacing to difficulty icons on direct panels (#5957)
Add spacing to difficulty icons on direct panels
2019-09-03 18:44:58 +09:00
858828d4ef Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher 2019-09-03 18:31:19 +09:00
002de80c30 Add xmldoc to ISkin 2019-09-03 18:30:22 +09:00
352fd3efda Bump ppy.osu.Game.Resources from 2019.903.0 to 2019.903.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.903.0 to 2019.903.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.0...2019.903.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-03 09:18:24 +00:00
097012dc95 Move slider ball colouring to DefaultLegacySkin for now 2019-09-03 18:05:16 +09:00
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
b7f1efbf38 Merge branch 'master' into center-icon-and-text-correctly 2019-09-03 14:51:59 +09:00
d1cdf49dd5 Revert SkinnableSprite lookups to old behaviour 2019-09-03 14:21:54 +09:00
05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
4cad55cee6 Move hit windows lookup to DrawableRuleset 2019-09-03 13:05:03 +09:00
444419b2e6 Update resources 2019-09-03 12:04:49 +09:00
4a8bdbd014 Merge remote-tracking branch 'upstream/master' into play-to-gameplay 2019-09-03 12:04:46 +09:00
0261456d5a Merge branch 'master' into play-to-gameplay 2019-09-03 11:42:15 +09:00
eab06995d0 Add some whitespace 2019-09-03 11:37:56 +09:00
ec8726e163 Merge remote-tracking branch 'origin/master' into background-beat 2019-09-03 11:35:20 +09:00
3b769128a8 Add a 60bpm beat when no beatmap is playing 2019-09-03 00:57:29 +02:00
de6dba9716 Use float type for chat overlay height 2019-09-03 01:50:52 +03:00
cb55159b28 Use float types for cursor sizes 2019-09-03 01:28:51 +03:00
ce446826e8 Match web's max diff icon number 2019-09-02 11:00:12 -07:00
5d3f3b7cc2 Add spacing to diff icons on direct panels 2019-09-02 10:59:43 -07:00
6ca17bdfd5 Center icon and text using anchor and origin instead of margin 2019-09-02 10:42:21 -07:00
53c254c6a5 Replace Array.IndexOf() with Contains() 2019-09-02 19:01:36 +02:00
09097f7680 Merge branch 'master' into iskincomponent 2019-09-02 22:38:57 +09:00
91e3eeb1c0 Merge branch 'master' into beatmap-mod-selector 2019-09-02 21:35:42 +09:00
3443a9517f Merge pull request #5953 from peppy/fix-direct-panel-unbind-nullref
Fix potential null reference on DirectPanel unbind
2019-09-02 21:35:17 +09:00
1e7528c2b3 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-02 19:13:00 +09:00
b460f76fa6 Adjust file spacing slightly 2019-09-02 19:01:43 +09:00
0bfe4650c3 Early return if no change occurred in looping value 2019-09-02 19:01:17 +09:00
f08b523abf Name tuple items 2019-09-02 18:20:30 +09:00
9c53430a0f Only initialise when required 2019-09-02 18:18:59 +09:00
eaeecfb300 Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound 2019-09-02 18:15:17 +09:00
f20e07136a Add attribute to catch potential future nullrefs 2019-09-02 17:48:41 +09:00
be5baef386 Merge pull request #5778 from EVAST9919/kudosu-info
Add kudosu history to UserProfileOverlay
2019-09-02 17:22:53 +09:00
f6102b4d92 Adjust xmldoc 2019-09-02 17:15:36 +09:00
0c73c5acf3 Expose full hitobject rather than hit windows 2019-09-02 17:14:40 +09:00
841da7d691 Fix potential null reference on DirectPanel unbind 2019-09-02 17:12:32 +09:00
d21d68b36c Refactor to match web implementation 1:1 2019-09-02 17:04:38 +09:00
f2bdf94a1d Add HitWindows to JudgementResult to indicate timing errors 2019-09-02 16:28:14 +09:00
0a89603e79 Fix hit error potentially not displaying with null hitwindows 2019-09-02 16:07:16 +09:00
0985b1679f Move enum to response class 2019-09-02 15:57:55 +09:00
3d551b08a9 Rename legacy actions 2019-09-02 15:57:23 +09:00
da45070373 Group common prefixes together 2019-09-02 15:44:21 +09:00