-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Comparing changes
Open a pull request
base repository: textmate/textmate
base: master
head repository: bj7/textmate
compare: master
- 19 commits
- 2 files changed
- 3 contributors
Commits on May 25, 2016
-
Josh Bernitt committed
May 25, 2016 Configuration menu - View commit details
-
Copy full SHA for f9776d3 - Browse repository at this point
Copy the full SHA f9776d3View commit details
Commits on May 29, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for a6e1675 - Browse repository at this point
Copy the full SHA a6e1675View commit details -
Configuration menu - View commit details
-
Copy full SHA for 413b3cf - Browse repository at this point
Copy the full SHA 413b3cfView commit details -
Configuration menu - View commit details
-
Copy full SHA for f675ff3 - Browse repository at this point
Copy the full SHA f675ff3View commit details
Commits on Jun 8, 2016
-
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
Configuration menu - View commit details
-
Copy full SHA for 2d13a95 - Browse repository at this point
Copy the full SHA 2d13a95View commit details -
Rename Open Favorites… menu item to Recent Projects…
Also use ellipsis glyph for the Open… menu item.
Configuration menu - View commit details
-
Copy full SHA for cb2ce0d - Browse repository at this point
Copy the full SHA cb2ce0dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 722b8b0 - Browse repository at this point
Copy the full SHA 722b8b0View commit details -
Introduce new callback: callback.document.did-open
Bundle items using this as their semantic class will be executed when the document is first loaded.
Configuration menu - View commit details
-
Copy full SHA for 582c43b - Browse repository at this point
Copy the full SHA 582c43bView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for d119c06 - Browse repository at this point
Copy the full SHA d119c06View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 5dd00c1 - Browse repository at this point
Copy the full SHA 5dd00c1View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for fcb9d83 - Browse repository at this point
Copy the full SHA fcb9d83View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for f031ca6 - Browse repository at this point
Copy the full SHA f031ca6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d9ff0c - Browse repository at this point
Copy the full SHA 2d9ff0cView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for d3bea4b - Browse repository at this point
Copy the full SHA d3bea4bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2b7463d - Browse repository at this point
Copy the full SHA 2b7463dView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 0a22519 - Browse repository at this point
Copy the full SHA 0a22519View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7cc82dd - Browse repository at this point
Copy the full SHA 7cc82ddView commit details
Commits on Nov 3, 2016
-
Josh Bernitt committed
Nov 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 3e8d270 - Browse repository at this point
Copy the full SHA 3e8d270View commit details -
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 committedNov 3, 2016 Configuration menu - View commit details
-
Copy full SHA for 8658573 - Browse repository at this point
Copy the full SHA 8658573View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff master...master