github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-22 23:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove comments

Browse Source
This commit is contained in:
Ryan O'Neill 2015-04-22 18:00:22 -07:00
parent 0d82d74675
commit 2ea5e21511
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/src/main/java/com/typesafe/config/impl/ConfigParser.java
View File

@ -187,14 +187,6 @@ final class ConfigParser {
throw new ConfigException.BugOrBroken("should not be reached"); throw new ConfigException.BugOrBroken("should not be reached");
} }
// we really should make this work, but for now throwing an
// exception is better than producing an incorrect result.
// See https://github.com/typesafehub/config/issues/160
// if (arrayCount > 0 && obj.resolveStatus() != ResolveStatus.RESOLVED)
// throw parseError("Due to current limitations of the config parser, when an include statement is nested inside a list value, "
// + "${} substitutions inside the included file cannot be resolved correctly. Either move the include outside of the list value or "
// + "remove the ${} statements from the included file.");
if (!pathStack.isEmpty()) { if (!pathStack.isEmpty()) {
Path prefix = fullCurrentPath(); Path prefix = fullCurrentPath();
obj = obj.relativized(prefix); obj = obj.relativized(prefix);
@ -241,18 +233,6 @@ final class ConfigParser {
// path must be on-stack while we parse the value // path must be on-stack while we parse the value
pathStack.push(path); pathStack.push(path);
if (((ConfigNodeField) node).separator() == Tokens.PLUS_EQUALS) { if (((ConfigNodeField) node).separator() == Tokens.PLUS_EQUALS) {
// we really should make this work, but for now throwing
// an exception is better than producing an incorrect
// result. See
// https://github.com/typesafehub/config/issues/160
// if (arrayCount > 0)
// throw parseError("Due to current limitations of the config parser, += does not work nested inside a list. "
// + "+= expands to a ${} substitution and the path in ${} cannot currently refer to list elements. "
// + "You might be able to move the += outside of the list and then refer to it from inside the list with ${}.");
// because we will put it in an array after the fact so
// we want this to be incremented during the parseValue
// below in order to throw the above exception.
arrayCount += 1; arrayCount += 1;
} }

4
config/src/test/scala/com/typesafe/config/impl/ConcatenationTest.scala
View File

@ -353,11 +353,11 @@ class ConcatenationTest extends TestUtils {
@Test @Test
def plusEqualsMultipleTimesNestedInPlusEquals() { def plusEqualsMultipleTimesNestedInPlusEquals() {
val e = intercept[ConfigException.Parse] { val e = intercept[ConfigException.BugOrBroken] {
val conf = parseConfig("""x += { a += 1, a += 2, a += 3 } """).resolve() val conf = parseConfig("""x += { a += 1, a += 2, a += 3 } """).resolve()
assertEquals(Seq(1, 2, 3), conf.getObjectList("x").asScala.toVector(0).toConfig.getIntList("a").asScala.toList) assertEquals(Seq(1, 2, 3), conf.getObjectList("x").asScala.toVector(0).toConfig.getIntList("a").asScala.toList)
} }
assertTrue(e.getMessage.contains("limitation")) assertTrue(e.getMessage.contains("did not find"))
} }
// from https://github.com/typesafehub/config/issues/177 // from https://github.com/typesafehub/config/issues/177