Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: textmate/textmate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: bj7/textmate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 2 files changed
  • 3 contributors

Commits on May 25, 2016

  1. ignoring submodules

    Josh Bernitt committed May 25, 2016
    Configuration menu
    Copy the full SHA
    f9776d3 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2016

  1. Fix issue with lines matched by multiple folding patterns

    Previously when a line was a start or stop marker, and was also matched by `foldingIndentedBlockIgnore` then we would set the line’s indent to INT_MAX to ensure the line would not terminate a foldable indented section, i.e. basically storing the “line should be ignored” in the indent since the line’s type was already set to start or stop marker (rather than “ignored line”).
    
    However, the indent is used to pair start/stop markers, so if only one of a start/stop pair was also matched as an ignored line, they would not be considered a pair because of the different indent levels. The opposite could also be the case, where two lines with different indent were both ignored, and this was seen to share the same indent.
    
    This partially reverts commit 337ac12.
    sorbits authored and Josh Bernitt committed May 29, 2016
    Configuration menu
    Copy the full SHA
    a6e1675 View commit details
    Browse the repository at this point in the history
  2. Refactor: use emplace_back(…) instead of push_back(make_pair(…))

    sorbits authored and Josh Bernitt committed May 29, 2016
    Configuration menu
    Copy the full SHA
    413b3cf View commit details
    Browse the repository at this point in the history
  3. Fix typo in release notes (horizontal → vertical)

    sorbits authored and Josh Bernitt committed May 29, 2016
    Configuration menu
    Copy the full SHA
    f675ff3 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. Folding indented blocks no longer include trailing empty lines

    The rationale for this is that when empty lines are included it leaves no whitespace between functions.
    
    Example and TextMate 1.x behavior described here: http://pastie.org/private/lgtnlvc8tdvghoppocob5q
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    2d13a95 View commit details
    Browse the repository at this point in the history
  2. Rename Open Favorites… menu item to Recent Projects…

    Also use ellipsis glyph for the Open… menu item.
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    cb2ce0d View commit details
    Browse the repository at this point in the history
  3. Update window title for Recent Projects dialog

    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    722b8b0 View commit details
    Browse the repository at this point in the history
  4. Introduce new callback: callback.document.did-open

    Bundle items using this as their semantic class will be executed when the document is first loaded.
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    582c43b View commit details
    Browse the repository at this point in the history
  5. Multiple semantic classes can now be assigned to a bundle item

    The classes should be given as a comma-separated list and is mainly useful because the semantic class system doubles as a way to indicate that an item should be used as a callback.
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    d119c06 View commit details
    Browse the repository at this point in the history
  6. Add “Template” suffix to bookmark and folding gutter images

    Currently we assume that all images are template images and thus render them as such, but this might change.
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    5dd00c1 View commit details
    Browse the repository at this point in the history
  7. Add “Template” suffix to note, warning, error, and search images

    If we fail to load an image by name then we try again with a “Template” suffix so that commands can still set marks using just `note`, `warning`, and `error`.
    
    When loading by full path and the path (minus extension) has a “Template” suffix then we manually set the image’s template property to YES since the system only seems to do this for images loaded from bundles.
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    fcb9d83 View commit details
    Browse the repository at this point in the history
  8. Gutter images are only drawn as monochrome when isTemplate is YES

    This allows adding color swatches to the gutter e.g. to show CSS colors.
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    f031ca6 View commit details
    Browse the repository at this point in the history
  9. Checkin release notes

    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    2d9ff0c View commit details
    Browse the repository at this point in the history
  10. Exclude given scopes when extending selection

    This introduces new scope setting - excludeFromParagraphSelection, that
    prevents extending selection to some scopes, eg. on comment.line.
    
    Previously when reformatting paragraph comment lines were selected as paragraph
    lines, this have led to mixing comment content into reformatted paragraph
    content breaking the syntax of reformatted code, eg.:
    
      some very long ... line of text
      # some comment
      some other long ... line of text
    
    As an effect we got:
    
      some very long ...
      ... text # some comment some other ...
      ... line of text
    
    The problem described above was especially visible when using ⌃Q to Reformat
    block of Git commit message, when below of the typed text there was a Git
    default comment. Also this problem could be noticeable by authors using LaTeX.
    
    This change checks whether a candidate line scope for paragraph extension has a
    excludeFromParagraphSelection set to true and breaks upon such line, eg.
    comment line.
    
    Doing Select Paragraph ⌃⌥P again will select the comment as well.
    nanoant authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    d3bea4b View commit details
    Browse the repository at this point in the history
  11. Remove forward declaration of non-existing data type

    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    2b7463d View commit details
    Browse the repository at this point in the history
  12. Add algorithm to erase descendent keys form a std::map

    This can be used when the key is name spaced, e.g. `/foo/bar` or `foo.bar`. Here we can erase everything under foo by using `/foo/` or `foo.` respectively.
    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    0a22519 View commit details
    Browse the repository at this point in the history
  13. Remove descendants when mark to remove has a trailing slash

    sorbits authored and Josh Bernitt committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    7cc82dd View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2016

  1. git ignore

    Josh Bernitt committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    3e8d270 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of https://github.com/textmate/textmate

    # Conflicts:
    #	Applications/TextMate/about/Changes.md
    #	Applications/TextMate/resources/English.lproj/MainMenu.xib
    #	Applications/TextMate/src/Favorites.mm
    #	Frameworks/DocumentWindow/src/DocumentWindowController.mm
    #	Frameworks/OakTextView/src/OakDocumentView.mm
    #	Frameworks/document/src/document.cc
    #	Frameworks/layout/src/ct.cc
    #	Frameworks/layout/src/folds.cc
    Josh Bernitt committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    8658573 View commit details
    Browse the repository at this point in the history
Loading