Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolved conflicts for "Added support for Odin" #3424

Merged
merged 18 commits into from Apr 5, 2022
Merged

Resolved conflicts for "Added support for Odin" #3424

merged 18 commits into from Apr 5, 2022

Commits on Dec 14, 2021

  1. Add Odin

    @edukisto
    edukisto committed Dec 14, 2021
    Copy the full SHA
    71378a0 View commit details
    Browse the repository at this point in the history

  2. Change \S\s to \s\S

    @edukisto
    edukisto committed Dec 14, 2021
    Copy the full SHA
    f46e69d View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Add support for comments with 1 level of nesting 

    Co-authored-by: Michael Schmidt <msrd0000@gmail.com>
    @edukisto @RunDevelopment
    edukisto and RunDevelopment committed Dec 17, 2021
    Copy the full SHA
    3a67123 View commit details
    Browse the repository at this point in the history

  2. Fix tests for comments

    @edukisto
    edukisto committed Dec 17, 2021
    Copy the full SHA
    68fca76 View commit details
    Browse the repository at this point in the history

  3. Fix the comment pattern to prevent exponential backtracking

    @edukisto
    edukisto committed Dec 17, 2021
    Copy the full SHA
    d87b7fe View commit details
    Browse the repository at this point in the history

  4. Add a missing newline to the JSDoc block

    @edukisto
    edukisto committed Dec 17, 2021
    Copy the full SHA
    f0e1bd1 View commit details
    Browse the repository at this point in the history

  5. Make the char pattern greedy

    @edukisto
    edukisto committed Dec 17, 2021
    Copy the full SHA
    f0eff95 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2021

  1. Allow spaces and tabs after the name of a function

    @edukisto
    edukisto committed Dec 18, 2021
    Copy the full SHA
    f7569f0 View commit details
    Browse the repository at this point in the history

  2. Separate directives, operators, punctuation marks, etc.

    @edukisto
    edukisto committed Dec 18, 2021
    Copy the full SHA
    ee47b20 View commit details
    Browse the repository at this point in the history

  3. Fix errors

    @edukisto
    edukisto committed Dec 18, 2021
    Copy the full SHA
    babdd8c View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. Make _ a discard variable

    @edukisto
    edukisto committed Dec 20, 2021
    Copy the full SHA
    7a292f2 View commit details
    Browse the repository at this point in the history

  2. Reimplement the searching for procedure names

    @edukisto
    edukisto committed Dec 20, 2021
    Copy the full SHA
    cd99873 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Simplified proc matching

    @RunDevelopment
    RunDevelopment committed Mar 22, 2022
    Copy the full SHA
    95e8b90 View commit details
    Browse the repository at this point in the history

  2. Improved number pattern

    @RunDevelopment
    RunDevelopment committed Mar 22, 2022
    Copy the full SHA
    9ee49f9 View commit details
    Browse the repository at this point in the history

  3. Simplified escape handling

    @RunDevelopment
    RunDevelopment committed Mar 22, 2022
    Copy the full SHA
    9770e09 View commit details
    Browse the repository at this point in the history

  4. Rebuild

    @RunDevelopment
    RunDevelopment committed Mar 22, 2022
    Copy the full SHA
    9f52675 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2022

  1. Merge pull request #1 from RunDevelopment/impr-3204 

    Address review comments
    @edukisto
    edukisto committed Mar 28, 2022
    Copy the full SHA
    6e85ff4 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. Merge branch 'master' into pr-3280

    @RunDevelopment
    RunDevelopment committed Apr 5, 2022
    Copy the full SHA
    076e2d5 View commit details
    Browse the repository at this point in the history