Made the unicode feature optional for inline highlighting
This commit is contained in:
parent
84f9bc35c6
commit
df4be6b493
4 changed files with 22 additions and 2 deletions
|
|
@ -2,6 +2,10 @@
|
||||||
|
|
||||||
All notable changes to similar are documented here.
|
All notable changes to similar are documented here.
|
||||||
|
|
||||||
|
## 1.2.0
|
||||||
|
|
||||||
|
* Make the unicode feature optional for inline diffing.
|
||||||
|
|
||||||
## 1.1.0
|
## 1.1.0
|
||||||
|
|
||||||
* More generic lifetimes for `iter_changes` and `iter_inline_changes`.
|
* More generic lifetimes for `iter_changes` and `iter_inline_changes`.
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ all-features = true
|
||||||
[features]
|
[features]
|
||||||
default = ["text"]
|
default = ["text"]
|
||||||
text = []
|
text = []
|
||||||
inline = ["unicode"]
|
inline = ["text"]
|
||||||
|
|
||||||
# this annoyingly currently also turns on bstr and not just bstr/unicode
|
# this annoyingly currently also turns on bstr and not just bstr/unicode
|
||||||
# unclear if this is fixable
|
# unclear if this is fixable
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,17 @@ impl<'bufs, 's, T: DiffableStr + ?Sized> MultiLookup<'bufs, 's, T> {
|
||||||
let mut seqs = Vec::new();
|
let mut seqs = Vec::new();
|
||||||
for (string_idx, string) in strings.iter().enumerate() {
|
for (string_idx, string) in strings.iter().enumerate() {
|
||||||
let mut offset = 0;
|
let mut offset = 0;
|
||||||
for word in string.tokenize_unicode_words() {
|
let iter = {
|
||||||
|
#[cfg(feature = "unicode")]
|
||||||
|
{
|
||||||
|
string.tokenize_unicode_words()
|
||||||
|
}
|
||||||
|
#[cfg(not(feature = "unicode"))]
|
||||||
|
{
|
||||||
|
string.tokenize_words()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
for word in iter {
|
||||||
seqs.push((word, string_idx, offset));
|
seqs.push((word, string_idx, offset));
|
||||||
offset += word.len();
|
offset += word.len();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -485,6 +485,12 @@ impl<'old, 'new, 'bufs, T: DiffableStr + ?Sized + 'old + 'new> TextDiff<'old, 'n
|
||||||
/// level diff on adjacent line replacements. The exact behavior of
|
/// level diff on adjacent line replacements. The exact behavior of
|
||||||
/// this function with regards to how it detects those inline changes
|
/// this function with regards to how it detects those inline changes
|
||||||
/// is currently not defined and will likely change over time.
|
/// is currently not defined and will likely change over time.
|
||||||
|
///
|
||||||
|
/// As of similar 1.2.0 the behavior of this function changes depending on
|
||||||
|
/// if the `unicode` feature is enabled or not. It will prefer unicode word
|
||||||
|
/// splitting over word splitting depending on the feature flag.
|
||||||
|
///
|
||||||
|
/// Requires the `inline` feature.
|
||||||
#[cfg(feature = "inline")]
|
#[cfg(feature = "inline")]
|
||||||
pub fn iter_inline_changes<'x, 'slf>(
|
pub fn iter_inline_changes<'x, 'slf>(
|
||||||
&'slf self,
|
&'slf self,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue