Dave Jarvis' Repositories

git clone https://repo.autonoma.ca/repo/keenwrite.git

Avoid logging unresolved issues due to bootstrap issues

AuthorDaveJarvis <email>
Date2021-01-03 11:10:53 GMT-0800
Commit360949a96884faabcaf861e2231b1a5bf2dd4c47
Parent9893293
Delta8 lines added, 6 lines removed, 2-line increase
src/main/resources/com/keenwrite/messages.properties
Main.status.export.success=Saved as {0}
+Main.status.error.bootstrap.eval=Note: Bootstrap definition of ''{0}'' not found
+
Main.status.error.parse={0} (near ${Main.status.text.offset} {1})
Main.status.error.def.blank=Move the caret to a word before inserting a definition
src/main/java/com/keenwrite/processors/ProcessorFactory.java
final var processor = switch( context.getFileType() ) {
- case RMARKDOWN -> createRProcessor( successor );
- case SOURCE -> createMarkdownProcessor( successor );
+ //case RMARKDOWN -> createRProcessor( successor );
+ case SOURCE, RMARKDOWN -> createMarkdownProcessor( successor );
case RXML -> createRXMLProcessor( successor );
case XML -> createXMLProcessor( successor );
src/main/java/com/keenwrite/processors/RVariableProcessor.java
@Override
protected Map<String, String> getDefinitions() {
- return toR( super.getDefinitions() );
+ return entoken( super.getDefinitions() );
}
/**
* Converts the given map from regular variables to R variables.
*
* @param map Map of variable names to values.
* @return Map of R variables.
*/
- private Map<String, String> toR( final Map<String, String> map ) {
+ private Map<String, String> entoken( final Map<String, String> map ) {
final var rMap = new HashMap<String, String>( map.size() );
for( final var entry : map.entrySet() ) {
final var key = entry.getKey();
- rMap.put( mSigilOperator.entoken( key ), toRValue( map.get( key ) ) );
+ rMap.put( mSigilOperator.entoken( key ), escape( map.get( key ) ) );
}
return rMap;
}
- private String toRValue( final String value ) {
+ private String escape( final String value ) {
return '\'' + escape( value, '\'', "\\'" ) + '\'';
}