Fix issue with escape sequences in properties file
See: https://github.com/spring-projects/sts4/issues/314
This commit is contained in:
Kris De Volder
@@ -1,3 +1,4 @@
|
||||
target
|
||||
.idea
|
||||
*.iml
|
||||
antlr-*.jar
|
||||
|
||||
10
headless-services/commons/java-properties/generate-parser.sh
Executable file
10
headless-services/commons/java-properties/generate-parser.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
ANTLR_VERSION=4.5.3
|
||||
if [ ! -f antlr-${ANTLR_VERSION}.jar ]; then
|
||||
curl https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar --output antlr-${ANTLR_VERSION}.jar
|
||||
fi
|
||||
workdir=$(pwd)
|
||||
cd resources
|
||||
java -jar ${workdir}/antlr-${ANTLR_VERSION}.jar JavaProperties.g4 -o ${workdir}/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser -package org.springframework.ide.vscode.java.properties.antlr.parser
|
||||
|
||||
@@ -60,11 +60,22 @@ valueChar
|
||||
| Exclamation
|
||||
| Number
|
||||
| Space
|
||||
| Backslash LineBreak
|
||||
| Backslash anyChar
|
||||
| Equals
|
||||
| Colon
|
||||
;
|
||||
|
||||
anyChar
|
||||
: LineBreak
|
||||
| IdentifierChar
|
||||
| Backslash
|
||||
| Colon
|
||||
| Equals
|
||||
| Space
|
||||
| Exclamation
|
||||
| Number
|
||||
;
|
||||
|
||||
Backslash : '\\';
|
||||
Colon : ':';
|
||||
Equals : '=';
|
||||
|
||||
@@ -40,9 +40,11 @@ import com.google.common.collect.ImmutableList;
|
||||
|
||||
/**
|
||||
* ANTLR based parser implementation
|
||||
* <p>
|
||||
* To regenerate the parser from Antlr4 grammar, see the
|
||||
* generate-parser.sh bash script in this project's root.
|
||||
*
|
||||
* @author Alex Boyko
|
||||
*
|
||||
*/
|
||||
public class AntlrParser implements Parser {
|
||||
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2016-2017 Pivotal, Inc.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* https://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* Pivotal, Inc. - initial API and implementation
|
||||
*******************************************************************************/
|
||||
|
||||
// Generated from JavaProperties.g4 by ANTLR 4.5.3
|
||||
package org.springframework.ide.vscode.java.properties.antlr.parser;
|
||||
|
||||
@@ -142,6 +131,18 @@ public class JavaPropertiesBaseListener implements JavaPropertiesListener {
|
||||
* <p>The default implementation does nothing.</p>
|
||||
*/
|
||||
@Override public void exitValueChar(JavaPropertiesParser.ValueCharContext ctx) { }
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*
|
||||
* <p>The default implementation does nothing.</p>
|
||||
*/
|
||||
@Override public void enterAnyChar(JavaPropertiesParser.AnyCharContext ctx) { }
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*
|
||||
* <p>The default implementation does nothing.</p>
|
||||
*/
|
||||
@Override public void exitAnyChar(JavaPropertiesParser.AnyCharContext ctx) { }
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2016-2017 Pivotal, Inc.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* https://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* Pivotal, Inc. - initial API and implementation
|
||||
*******************************************************************************/
|
||||
|
||||
// Generated from JavaProperties.g4 by ANTLR 4.5.3
|
||||
package org.springframework.ide.vscode.java.properties.antlr.parser;
|
||||
import org.antlr.v4.runtime.Lexer;
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2016-2017 Pivotal, Inc.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* https://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* Pivotal, Inc. - initial API and implementation
|
||||
*******************************************************************************/
|
||||
|
||||
// Generated from JavaProperties.g4 by ANTLR 4.5.3
|
||||
package org.springframework.ide.vscode.java.properties.antlr.parser;
|
||||
import org.antlr.v4.runtime.tree.ParseTreeListener;
|
||||
@@ -118,4 +107,14 @@ public interface JavaPropertiesListener extends ParseTreeListener {
|
||||
* @param ctx the parse tree
|
||||
*/
|
||||
void exitValueChar(JavaPropertiesParser.ValueCharContext ctx);
|
||||
/**
|
||||
* Enter a parse tree produced by {@link JavaPropertiesParser#anyChar}.
|
||||
* @param ctx the parse tree
|
||||
*/
|
||||
void enterAnyChar(JavaPropertiesParser.AnyCharContext ctx);
|
||||
/**
|
||||
* Exit a parse tree produced by {@link JavaPropertiesParser#anyChar}.
|
||||
* @param ctx the parse tree
|
||||
*/
|
||||
void exitAnyChar(JavaPropertiesParser.AnyCharContext ctx);
|
||||
}
|
||||
@@ -1,14 +1,3 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2016-2017 Pivotal, Inc.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* https://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* Pivotal, Inc. - initial API and implementation
|
||||
*******************************************************************************/
|
||||
|
||||
// Generated from JavaProperties.g4 by ANTLR 4.5.3
|
||||
package org.springframework.ide.vscode.java.properties.antlr.parser;
|
||||
import org.antlr.v4.runtime.atn.*;
|
||||
@@ -33,10 +22,10 @@ public class JavaPropertiesParser extends Parser {
|
||||
public static final int
|
||||
RULE_parse = 0, RULE_line = 1, RULE_propertyLine = 2, RULE_commentLine = 3,
|
||||
RULE_emptyLine = 4, RULE_keyValuePair = 5, RULE_key = 6, RULE_keyChar = 7,
|
||||
RULE_separatorAndValue = 8, RULE_valueChar = 9;
|
||||
RULE_separatorAndValue = 8, RULE_valueChar = 9, RULE_anyChar = 10;
|
||||
public static final String[] ruleNames = {
|
||||
"parse", "line", "propertyLine", "commentLine", "emptyLine", "keyValuePair",
|
||||
"key", "keyChar", "separatorAndValue", "valueChar"
|
||||
"key", "keyChar", "separatorAndValue", "valueChar", "anyChar"
|
||||
};
|
||||
|
||||
private static final String[] _LITERAL_NAMES = {
|
||||
@@ -124,21 +113,21 @@ public class JavaPropertiesParser extends Parser {
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(23);
|
||||
setState(25);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Exclamation) | (1L << Number) | (1L << LineBreak) | (1L << Space) | (1L << IdentifierChar))) != 0)) {
|
||||
{
|
||||
{
|
||||
setState(20);
|
||||
setState(22);
|
||||
line();
|
||||
}
|
||||
}
|
||||
setState(25);
|
||||
setState(27);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
}
|
||||
setState(26);
|
||||
setState(28);
|
||||
match(EOF);
|
||||
}
|
||||
}
|
||||
@@ -181,27 +170,27 @@ public class JavaPropertiesParser extends Parser {
|
||||
LineContext _localctx = new LineContext(_ctx, getState());
|
||||
enterRule(_localctx, 2, RULE_line);
|
||||
try {
|
||||
setState(31);
|
||||
setState(33);
|
||||
_errHandler.sync(this);
|
||||
switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
|
||||
case 1:
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(28);
|
||||
setState(30);
|
||||
propertyLine();
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
enterOuterAlt(_localctx, 2);
|
||||
{
|
||||
setState(29);
|
||||
setState(31);
|
||||
commentLine();
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
enterOuterAlt(_localctx, 3);
|
||||
{
|
||||
setState(30);
|
||||
setState(32);
|
||||
emptyLine();
|
||||
}
|
||||
break;
|
||||
@@ -247,21 +236,21 @@ public class JavaPropertiesParser extends Parser {
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(36);
|
||||
setState(38);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
while (_la==Space) {
|
||||
{
|
||||
{
|
||||
setState(33);
|
||||
setState(35);
|
||||
match(Space);
|
||||
}
|
||||
}
|
||||
setState(38);
|
||||
setState(40);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
}
|
||||
setState(39);
|
||||
setState(41);
|
||||
keyValuePair();
|
||||
}
|
||||
}
|
||||
@@ -309,34 +298,34 @@ public class JavaPropertiesParser extends Parser {
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(44);
|
||||
setState(46);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
while (_la==Space) {
|
||||
{
|
||||
{
|
||||
setState(41);
|
||||
setState(43);
|
||||
match(Space);
|
||||
}
|
||||
}
|
||||
setState(46);
|
||||
setState(48);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
}
|
||||
setState(47);
|
||||
setState(49);
|
||||
_la = _input.LA(1);
|
||||
if ( !(_la==Exclamation || _la==Number) ) {
|
||||
_errHandler.recoverInline(this);
|
||||
} else {
|
||||
consume();
|
||||
}
|
||||
setState(51);
|
||||
setState(53);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Colon) | (1L << Equals) | (1L << Exclamation) | (1L << Number) | (1L << Space) | (1L << IdentifierChar))) != 0)) {
|
||||
{
|
||||
{
|
||||
setState(48);
|
||||
setState(50);
|
||||
_la = _input.LA(1);
|
||||
if ( _la <= 0 || (_la==LineBreak) ) {
|
||||
_errHandler.recoverInline(this);
|
||||
@@ -345,11 +334,11 @@ public class JavaPropertiesParser extends Parser {
|
||||
}
|
||||
}
|
||||
}
|
||||
setState(53);
|
||||
setState(55);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
}
|
||||
setState(54);
|
||||
setState(56);
|
||||
_la = _input.LA(1);
|
||||
if ( !(_la==EOF || _la==LineBreak) ) {
|
||||
_errHandler.recoverInline(this);
|
||||
@@ -396,21 +385,21 @@ public class JavaPropertiesParser extends Parser {
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(59);
|
||||
setState(61);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
while (_la==Space) {
|
||||
{
|
||||
{
|
||||
setState(56);
|
||||
setState(58);
|
||||
match(Space);
|
||||
}
|
||||
}
|
||||
setState(61);
|
||||
setState(63);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
}
|
||||
setState(62);
|
||||
setState(64);
|
||||
match(LineBreak);
|
||||
}
|
||||
}
|
||||
@@ -455,11 +444,11 @@ public class JavaPropertiesParser extends Parser {
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(64);
|
||||
key();
|
||||
setState(65);
|
||||
separatorAndValue();
|
||||
setState(66);
|
||||
key();
|
||||
setState(67);
|
||||
separatorAndValue();
|
||||
setState(68);
|
||||
_la = _input.LA(1);
|
||||
if ( !(_la==EOF || _la==LineBreak) ) {
|
||||
_errHandler.recoverInline(this);
|
||||
@@ -507,17 +496,17 @@ public class JavaPropertiesParser extends Parser {
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(69);
|
||||
setState(71);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
do {
|
||||
{
|
||||
{
|
||||
setState(68);
|
||||
setState(70);
|
||||
keyChar();
|
||||
}
|
||||
}
|
||||
setState(71);
|
||||
setState(73);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
} while ( _la==Backslash || _la==IdentifierChar );
|
||||
@@ -558,21 +547,21 @@ public class JavaPropertiesParser extends Parser {
|
||||
enterRule(_localctx, 14, RULE_keyChar);
|
||||
int _la;
|
||||
try {
|
||||
setState(76);
|
||||
setState(78);
|
||||
switch (_input.LA(1)) {
|
||||
case IdentifierChar:
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(73);
|
||||
setState(75);
|
||||
match(IdentifierChar);
|
||||
}
|
||||
break;
|
||||
case Backslash:
|
||||
enterOuterAlt(_localctx, 2);
|
||||
{
|
||||
setState(74);
|
||||
setState(76);
|
||||
match(Backslash);
|
||||
setState(75);
|
||||
setState(77);
|
||||
_la = _input.LA(1);
|
||||
if ( !(_la==Colon || _la==Equals) ) {
|
||||
_errHandler.recoverInline(this);
|
||||
@@ -627,24 +616,24 @@ public class JavaPropertiesParser extends Parser {
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(78);
|
||||
setState(80);
|
||||
_la = _input.LA(1);
|
||||
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Colon) | (1L << Equals) | (1L << Space))) != 0)) ) {
|
||||
_errHandler.recoverInline(this);
|
||||
} else {
|
||||
consume();
|
||||
}
|
||||
setState(82);
|
||||
setState(84);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Colon) | (1L << Equals) | (1L << Exclamation) | (1L << Number) | (1L << Space) | (1L << IdentifierChar))) != 0)) {
|
||||
{
|
||||
{
|
||||
setState(79);
|
||||
setState(81);
|
||||
valueChar();
|
||||
}
|
||||
}
|
||||
setState(84);
|
||||
setState(86);
|
||||
_errHandler.sync(this);
|
||||
_la = _input.LA(1);
|
||||
}
|
||||
@@ -667,7 +656,9 @@ public class JavaPropertiesParser extends Parser {
|
||||
public TerminalNode Number() { return getToken(JavaPropertiesParser.Number, 0); }
|
||||
public TerminalNode Space() { return getToken(JavaPropertiesParser.Space, 0); }
|
||||
public TerminalNode Backslash() { return getToken(JavaPropertiesParser.Backslash, 0); }
|
||||
public TerminalNode LineBreak() { return getToken(JavaPropertiesParser.LineBreak, 0); }
|
||||
public AnyCharContext anyChar() {
|
||||
return getRuleContext(AnyCharContext.class,0);
|
||||
}
|
||||
public TerminalNode Equals() { return getToken(JavaPropertiesParser.Equals, 0); }
|
||||
public TerminalNode Colon() { return getToken(JavaPropertiesParser.Colon, 0); }
|
||||
public ValueCharContext(ParserRuleContext parent, int invokingState) {
|
||||
@@ -688,56 +679,56 @@ public class JavaPropertiesParser extends Parser {
|
||||
ValueCharContext _localctx = new ValueCharContext(_ctx, getState());
|
||||
enterRule(_localctx, 18, RULE_valueChar);
|
||||
try {
|
||||
setState(93);
|
||||
setState(95);
|
||||
switch (_input.LA(1)) {
|
||||
case IdentifierChar:
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(85);
|
||||
setState(87);
|
||||
match(IdentifierChar);
|
||||
}
|
||||
break;
|
||||
case Exclamation:
|
||||
enterOuterAlt(_localctx, 2);
|
||||
{
|
||||
setState(86);
|
||||
setState(88);
|
||||
match(Exclamation);
|
||||
}
|
||||
break;
|
||||
case Number:
|
||||
enterOuterAlt(_localctx, 3);
|
||||
{
|
||||
setState(87);
|
||||
setState(89);
|
||||
match(Number);
|
||||
}
|
||||
break;
|
||||
case Space:
|
||||
enterOuterAlt(_localctx, 4);
|
||||
{
|
||||
setState(88);
|
||||
setState(90);
|
||||
match(Space);
|
||||
}
|
||||
break;
|
||||
case Backslash:
|
||||
enterOuterAlt(_localctx, 5);
|
||||
{
|
||||
setState(89);
|
||||
setState(91);
|
||||
match(Backslash);
|
||||
setState(90);
|
||||
match(LineBreak);
|
||||
setState(92);
|
||||
anyChar();
|
||||
}
|
||||
break;
|
||||
case Equals:
|
||||
enterOuterAlt(_localctx, 6);
|
||||
{
|
||||
setState(91);
|
||||
setState(93);
|
||||
match(Equals);
|
||||
}
|
||||
break;
|
||||
case Colon:
|
||||
enterOuterAlt(_localctx, 7);
|
||||
{
|
||||
setState(92);
|
||||
setState(94);
|
||||
match(Colon);
|
||||
}
|
||||
break;
|
||||
@@ -756,32 +747,83 @@ public class JavaPropertiesParser extends Parser {
|
||||
return _localctx;
|
||||
}
|
||||
|
||||
public static class AnyCharContext extends ParserRuleContext {
|
||||
public TerminalNode LineBreak() { return getToken(JavaPropertiesParser.LineBreak, 0); }
|
||||
public TerminalNode IdentifierChar() { return getToken(JavaPropertiesParser.IdentifierChar, 0); }
|
||||
public TerminalNode Backslash() { return getToken(JavaPropertiesParser.Backslash, 0); }
|
||||
public TerminalNode Colon() { return getToken(JavaPropertiesParser.Colon, 0); }
|
||||
public TerminalNode Equals() { return getToken(JavaPropertiesParser.Equals, 0); }
|
||||
public TerminalNode Space() { return getToken(JavaPropertiesParser.Space, 0); }
|
||||
public TerminalNode Exclamation() { return getToken(JavaPropertiesParser.Exclamation, 0); }
|
||||
public TerminalNode Number() { return getToken(JavaPropertiesParser.Number, 0); }
|
||||
public AnyCharContext(ParserRuleContext parent, int invokingState) {
|
||||
super(parent, invokingState);
|
||||
}
|
||||
@Override public int getRuleIndex() { return RULE_anyChar; }
|
||||
@Override
|
||||
public void enterRule(ParseTreeListener listener) {
|
||||
if ( listener instanceof JavaPropertiesListener ) ((JavaPropertiesListener)listener).enterAnyChar(this);
|
||||
}
|
||||
@Override
|
||||
public void exitRule(ParseTreeListener listener) {
|
||||
if ( listener instanceof JavaPropertiesListener ) ((JavaPropertiesListener)listener).exitAnyChar(this);
|
||||
}
|
||||
}
|
||||
|
||||
public final AnyCharContext anyChar() throws RecognitionException {
|
||||
AnyCharContext _localctx = new AnyCharContext(_ctx, getState());
|
||||
enterRule(_localctx, 20, RULE_anyChar);
|
||||
int _la;
|
||||
try {
|
||||
enterOuterAlt(_localctx, 1);
|
||||
{
|
||||
setState(97);
|
||||
_la = _input.LA(1);
|
||||
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Colon) | (1L << Equals) | (1L << Exclamation) | (1L << Number) | (1L << LineBreak) | (1L << Space) | (1L << IdentifierChar))) != 0)) ) {
|
||||
_errHandler.recoverInline(this);
|
||||
} else {
|
||||
consume();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (RecognitionException re) {
|
||||
_localctx.exception = re;
|
||||
_errHandler.reportError(this, re);
|
||||
_errHandler.recover(this, re);
|
||||
}
|
||||
finally {
|
||||
exitRule();
|
||||
}
|
||||
return _localctx;
|
||||
}
|
||||
|
||||
public static final String _serializedATN =
|
||||
"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\nb\4\2\t\2\4\3\t"+
|
||||
"\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t\13\3"+
|
||||
"\2\7\2\30\n\2\f\2\16\2\33\13\2\3\2\3\2\3\3\3\3\3\3\5\3\"\n\3\3\4\7\4%"+
|
||||
"\n\4\f\4\16\4(\13\4\3\4\3\4\3\5\7\5-\n\5\f\5\16\5\60\13\5\3\5\3\5\7\5"+
|
||||
"\64\n\5\f\5\16\5\67\13\5\3\5\3\5\3\6\7\6<\n\6\f\6\16\6?\13\6\3\6\3\6\3"+
|
||||
"\7\3\7\3\7\3\7\3\b\6\bH\n\b\r\b\16\bI\3\t\3\t\3\t\5\tO\n\t\3\n\3\n\7\n"+
|
||||
"S\n\n\f\n\16\nV\13\n\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\5\13`\n\13"+
|
||||
"\3\13\2\2\f\2\4\6\b\n\f\16\20\22\24\2\7\3\2\6\7\3\2\b\b\3\3\b\b\3\2\4"+
|
||||
"\5\4\2\4\5\t\tg\2\31\3\2\2\2\4!\3\2\2\2\6&\3\2\2\2\b.\3\2\2\2\n=\3\2\2"+
|
||||
"\2\fB\3\2\2\2\16G\3\2\2\2\20N\3\2\2\2\22P\3\2\2\2\24_\3\2\2\2\26\30\5"+
|
||||
"\4\3\2\27\26\3\2\2\2\30\33\3\2\2\2\31\27\3\2\2\2\31\32\3\2\2\2\32\34\3"+
|
||||
"\2\2\2\33\31\3\2\2\2\34\35\7\2\2\3\35\3\3\2\2\2\36\"\5\6\4\2\37\"\5\b"+
|
||||
"\5\2 \"\5\n\6\2!\36\3\2\2\2!\37\3\2\2\2! \3\2\2\2\"\5\3\2\2\2#%\7\t\2"+
|
||||
"\2$#\3\2\2\2%(\3\2\2\2&$\3\2\2\2&\'\3\2\2\2\')\3\2\2\2(&\3\2\2\2)*\5\f"+
|
||||
"\7\2*\7\3\2\2\2+-\7\t\2\2,+\3\2\2\2-\60\3\2\2\2.,\3\2\2\2./\3\2\2\2/\61"+
|
||||
"\3\2\2\2\60.\3\2\2\2\61\65\t\2\2\2\62\64\n\3\2\2\63\62\3\2\2\2\64\67\3"+
|
||||
"\2\2\2\65\63\3\2\2\2\65\66\3\2\2\2\668\3\2\2\2\67\65\3\2\2\289\t\4\2\2"+
|
||||
"9\t\3\2\2\2:<\7\t\2\2;:\3\2\2\2<?\3\2\2\2=;\3\2\2\2=>\3\2\2\2>@\3\2\2"+
|
||||
"\2?=\3\2\2\2@A\7\b\2\2A\13\3\2\2\2BC\5\16\b\2CD\5\22\n\2DE\t\4\2\2E\r"+
|
||||
"\3\2\2\2FH\5\20\t\2GF\3\2\2\2HI\3\2\2\2IG\3\2\2\2IJ\3\2\2\2J\17\3\2\2"+
|
||||
"\2KO\7\n\2\2LM\7\3\2\2MO\t\5\2\2NK\3\2\2\2NL\3\2\2\2O\21\3\2\2\2PT\t\6"+
|
||||
"\2\2QS\5\24\13\2RQ\3\2\2\2SV\3\2\2\2TR\3\2\2\2TU\3\2\2\2U\23\3\2\2\2V"+
|
||||
"T\3\2\2\2W`\7\n\2\2X`\7\6\2\2Y`\7\7\2\2Z`\7\t\2\2[\\\7\3\2\2\\`\7\b\2"+
|
||||
"\2]`\7\5\2\2^`\7\4\2\2_W\3\2\2\2_X\3\2\2\2_Y\3\2\2\2_Z\3\2\2\2_[\3\2\2"+
|
||||
"\2_]\3\2\2\2_^\3\2\2\2`\25\3\2\2\2\f\31!&.\65=INT_";
|
||||
"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\nf\4\2\t\2\4\3\t"+
|
||||
"\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t\13\4"+
|
||||
"\f\t\f\3\2\7\2\32\n\2\f\2\16\2\35\13\2\3\2\3\2\3\3\3\3\3\3\5\3$\n\3\3"+
|
||||
"\4\7\4\'\n\4\f\4\16\4*\13\4\3\4\3\4\3\5\7\5/\n\5\f\5\16\5\62\13\5\3\5"+
|
||||
"\3\5\7\5\66\n\5\f\5\16\59\13\5\3\5\3\5\3\6\7\6>\n\6\f\6\16\6A\13\6\3\6"+
|
||||
"\3\6\3\7\3\7\3\7\3\7\3\b\6\bJ\n\b\r\b\16\bK\3\t\3\t\3\t\5\tQ\n\t\3\n\3"+
|
||||
"\n\7\nU\n\n\f\n\16\nX\13\n\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\5\13"+
|
||||
"b\n\13\3\f\3\f\3\f\2\2\r\2\4\6\b\n\f\16\20\22\24\26\2\b\3\2\6\7\3\2\b"+
|
||||
"\b\3\3\b\b\3\2\4\5\4\2\4\5\t\t\3\2\3\nj\2\33\3\2\2\2\4#\3\2\2\2\6(\3\2"+
|
||||
"\2\2\b\60\3\2\2\2\n?\3\2\2\2\fD\3\2\2\2\16I\3\2\2\2\20P\3\2\2\2\22R\3"+
|
||||
"\2\2\2\24a\3\2\2\2\26c\3\2\2\2\30\32\5\4\3\2\31\30\3\2\2\2\32\35\3\2\2"+
|
||||
"\2\33\31\3\2\2\2\33\34\3\2\2\2\34\36\3\2\2\2\35\33\3\2\2\2\36\37\7\2\2"+
|
||||
"\3\37\3\3\2\2\2 $\5\6\4\2!$\5\b\5\2\"$\5\n\6\2# \3\2\2\2#!\3\2\2\2#\""+
|
||||
"\3\2\2\2$\5\3\2\2\2%\'\7\t\2\2&%\3\2\2\2\'*\3\2\2\2(&\3\2\2\2()\3\2\2"+
|
||||
"\2)+\3\2\2\2*(\3\2\2\2+,\5\f\7\2,\7\3\2\2\2-/\7\t\2\2.-\3\2\2\2/\62\3"+
|
||||
"\2\2\2\60.\3\2\2\2\60\61\3\2\2\2\61\63\3\2\2\2\62\60\3\2\2\2\63\67\t\2"+
|
||||
"\2\2\64\66\n\3\2\2\65\64\3\2\2\2\669\3\2\2\2\67\65\3\2\2\2\678\3\2\2\2"+
|
||||
"8:\3\2\2\29\67\3\2\2\2:;\t\4\2\2;\t\3\2\2\2<>\7\t\2\2=<\3\2\2\2>A\3\2"+
|
||||
"\2\2?=\3\2\2\2?@\3\2\2\2@B\3\2\2\2A?\3\2\2\2BC\7\b\2\2C\13\3\2\2\2DE\5"+
|
||||
"\16\b\2EF\5\22\n\2FG\t\4\2\2G\r\3\2\2\2HJ\5\20\t\2IH\3\2\2\2JK\3\2\2\2"+
|
||||
"KI\3\2\2\2KL\3\2\2\2L\17\3\2\2\2MQ\7\n\2\2NO\7\3\2\2OQ\t\5\2\2PM\3\2\2"+
|
||||
"\2PN\3\2\2\2Q\21\3\2\2\2RV\t\6\2\2SU\5\24\13\2TS\3\2\2\2UX\3\2\2\2VT\3"+
|
||||
"\2\2\2VW\3\2\2\2W\23\3\2\2\2XV\3\2\2\2Yb\7\n\2\2Zb\7\6\2\2[b\7\7\2\2\\"+
|
||||
"b\7\t\2\2]^\7\3\2\2^b\5\26\f\2_b\7\5\2\2`b\7\4\2\2aY\3\2\2\2aZ\3\2\2\2"+
|
||||
"a[\3\2\2\2a\\\3\2\2\2a]\3\2\2\2a_\3\2\2\2a`\3\2\2\2b\25\3\2\2\2cd\t\7"+
|
||||
"\2\2d\27\3\2\2\2\f\33#(\60\67?KPVa";
|
||||
public static final ATN _ATN =
|
||||
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
|
||||
static {
|
||||
|
||||
@@ -13,6 +13,7 @@ package org.springframework.ide.vscode.java.properties.parser.test;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -45,7 +46,9 @@ public class PropertiesAntlrParserTest {
|
||||
String expectedKey, String expectedEncodedKey,
|
||||
String expectedValue, String expectedEncodedValue) {
|
||||
ParseResults results = parser.parse(text);
|
||||
assertTrue(results.syntaxErrors.isEmpty());
|
||||
if (!results.syntaxErrors.isEmpty()) {
|
||||
fail(results.syntaxErrors.get(0).getMessage());
|
||||
}
|
||||
assertTrue(results.problems.isEmpty());
|
||||
assertEquals(1, results.ast.getAllNodes().size());
|
||||
|
||||
@@ -102,6 +105,18 @@ public class PropertiesAntlrParserTest {
|
||||
public void testPropertyWithColonSeparatorAndSpaces() throws Exception {
|
||||
testPropertyLine("key \t : \t \tvalue", "key", "key", "value", " \t \tvalue");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPropertyWithEscapedValue() {
|
||||
testPropertyLine("key=something \\nescapy", "key", "key", "something \nescapy", "something \\nescapy");
|
||||
testPropertyLine("key=something \\\\escapy", "key", "key", "something \\escapy", "something \\\\escapy");
|
||||
testPropertyLine("key=something\\:escapy", "key", "key", "something:escapy", "something\\:escapy");
|
||||
testPropertyLine("key=something\\=escapy", "key", "key", "something=escapy", "something\\=escapy");
|
||||
testPropertyLine("key=something\\ escapy", "key", "key", "something escapy", "something\\ escapy");
|
||||
testPropertyLine("key=something\\'escapy", "key", "key", "something'escapy", "something\\'escapy");
|
||||
testPropertyLine("key=something\\#escapy", "key", "key", "something#escapy", "something\\#escapy");
|
||||
testPropertyLine("key=something\\!escapy", "key", "key", "something!escapy", "something\\!escapy");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPropertyWithSpaceSeparator() throws Exception {
|
||||
|
||||
@@ -5,6 +5,7 @@ languageserver.completion-trigger-characters.spring-boot-properties-yaml: abcdef
|
||||
languageserver.completion-trigger-characters.spring-boot-properties: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.
|
||||
spring.main.banner-mode: off
|
||||
|
||||
#logging.level.org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer=debug
|
||||
#logging.level.org.springframework.ide.vscode.boot.java.utils.SpringIndexerJava=debug
|
||||
#logging.level.org.springframework.ide.vscode.boot.app.SpringSymbolIndex=debug
|
||||
#logging.level.org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp=off
|
||||
@@ -92,6 +92,22 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest {
|
||||
editor.assertProblems("key|extraneous input");
|
||||
}
|
||||
|
||||
@Test public void bug_GH_STS4_314() throws Exception {
|
||||
///See: https://github.com/spring-projects/sts4/issues/314
|
||||
data("my.text", "java.lang.String", null, null);
|
||||
Editor editor;
|
||||
|
||||
editor = newEditor(
|
||||
"my.text=something \\n escapy"
|
||||
);
|
||||
editor.assertProblems(/*NONE*/);
|
||||
|
||||
editor = newEditor(
|
||||
"my.text=something simple"
|
||||
);
|
||||
editor.assertProblems(/*NONE*/);
|
||||
}
|
||||
|
||||
@Test public void bug_158348104() throws Exception {
|
||||
//See: https://www.pivotaltracker.com/story/show/158348104
|
||||
data("spring.activemq.close-timeout", "java.time.Duration", null, null);
|
||||
|
||||
Reference in New Issue
Block a user