Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git
keenwrite / Compare 5efdc54...fefb2ee
M build.gradle
1717
dependencies {
1818
  compile 'org.controlsfx:controlsfx:8.40.12'
19
  compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.8.1'
20
  //compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '1.0.0-SNAPSHOT'
19
  compile 'org.fxmisc.wellbehaved:wellbehavedfx:0.3'
20
  compile 'org.fxmisc.richtext:richtextfx:0.8.1'
2121
  compile 'com.miglayout:miglayout-javafx:5.0'
2222
  compile 'de.jensd:fontawesomefx-fontawesome:4.5.0'
23
  compile 'org.ahocorasick:ahocorasick:0.3.0'
24
  compile 'com.vladsch.flexmark:flexmark:0.18.5'
25
  compile 'com.vladsch.flexmark:flexmark-ext-tables:0.18.5'
26
  compile 'com.vladsch.flexmark:flexmark-ext-superscript:0.18.5'
27
  compile 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.18.5'
28
  compile 'com.fasterxml.jackson.core:jackson-core:2.8.4'
29
  compile 'com.fasterxml.jackson.core:jackson-databind:2.8.4'
30
  compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.4'
31
  compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.4'
32
  compile 'org.yaml:snakeyaml:1.17'
33
  compile 'com.ximpleware:vtd-xml:2.13'
34
  compile 'net.sf.saxon:Saxon-HE:9.7.0-14'
23
  compile 'org.ahocorasick:ahocorasick:0.4.0'
24
  compile 'com.vladsch.flexmark:flexmark:0.28.2'
25
  compile 'com.vladsch.flexmark:flexmark-ext-tables:0.28.2'
26
  compile 'com.vladsch.flexmark:flexmark-ext-superscript:0.28.2'
27
  compile 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.28.2'
28
  compile 'com.fasterxml.jackson.core:jackson-core:2.9.2'
29
  compile 'com.fasterxml.jackson.core:jackson-databind:2.9.2'
30
  compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.2'
31
  compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.2'
32
  compile 'org.yaml:snakeyaml:1.19'
33
  compile 'com.ximpleware:vtd-xml:2.13.4'
34
  compile 'net.sf.saxon:Saxon-HE:9.8.0-6'
3535
  compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
36
  compile 'org.apache.commons:commons-configuration2:2.1'
36
  compile 'org.apache.commons:commons-configuration2:2.2'
3737
  compile files('libs/renjin-script-engine-0.8.2514-jar-with-dependencies.jar')
3838
}
3939
40
version = '1.3.0'
40
version = '1.3.2'
4141
applicationName = 'scrivenvar'
4242
mainClassName = 'com.scrivenvar.Main'
M src/main/java/com/scrivenvar/definition/VariableTreeItem.java
3232
import static com.scrivenvar.definition.yaml.YamlParser.SEPARATOR;
3333
import static com.scrivenvar.editors.VariableNameInjector.DEFAULT_MAX_VAR_LENGTH;
34
import java.text.Normalizer;
35
import static java.text.Normalizer.Form.NFD;
3436
import java.util.HashMap;
3537
import java.util.Map;
...
118120
119121
    return (VariableTreeItem<T>)node;
122
  }
123
124
  /**
125
   * Returns the value of the string without diacritic marks.
126
   * 
127
   * @return A non-null, possibly empty string.
128
   */
129
  private String getDiacriticlessValue() {
130
    final String value = getValue().toString();
131
    final String normalized = Normalizer.normalize(value, NFD);
132
    
133
    return normalized.replaceAll("\\p{M}", "");
120134
  }
121135
...
129143
   */
130144
  private boolean valueStartsWith( final String s ) {
131
    return isLeaf() && getValue().toString().startsWith( s );
145
    return isLeaf() && getDiacriticlessValue().startsWith( s );
132146
  }
133147
...
140154
   */
141155
  private boolean valueContains( final String s ) {
142
    return isLeaf() && getValue().toString().contains( s );
156
    return isLeaf() && getDiacriticlessValue().contains( s );
143157
  }
144158
M src/main/java/com/scrivenvar/editors/VariableNameInjector.java
139139
   */
140140
  private void initKeyboardEventListeners() {
141
    // Control and space are pressed.
141142
    addEventListener( keyPressed( SPACE, CONTROL_DOWN ), this::autocomplete );
142143