From ee7aa8139ee5d73c47ac17f7a8e478d8db3dd826 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 7 Feb 2019 16:02:18 +0100 Subject: [PATCH] fixed the line position of symbols from Spring XML config files --- .../java/utils/SpringIndexerXMLNamespaceHandlerBeans.java | 4 ++-- .../boot/java/utils/test/SpringIndexerXMLProjectTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerXMLNamespaceHandlerBeans.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerXMLNamespaceHandlerBeans.java index ccc19ed7a..4f57bd26c 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerXMLNamespaceHandlerBeans.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerXMLNamespaceHandlerBeans.java @@ -74,8 +74,8 @@ public class SpringIndexerXMLNamespaceHandlerBeans implements SpringIndexerXMLNa int endInLine = symbolEnd - document.getLineOffset(lineEnd); Range range = new Range(); - range.setStart(new Position(lineStart + 1, startInLine)); - range.setEnd(new Position(lineEnd + 1, endInLine)); + range.setStart(new Position(lineStart, startInLine)); + range.setEnd(new Position(lineEnd, endInLine)); Location location = new Location(); location.setUri(docURI); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java index c0a4afd5d..32c058413 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java @@ -73,10 +73,10 @@ public class SpringIndexerXMLProjectTest { assertEquals(4, allSymbols.size()); String docUri = directory.toPath().resolve("config/simple-spring-config.xml").toUri().toString(); - assertTrue(containsSymbol(allSymbols, "@+ 'transactionManager' DataSourceTransactionManager", docUri, 7, 14, 7, 37)); - assertTrue(containsSymbol(allSymbols, "@+ 'jdbcTemplate' JdbcTemplate", docUri, 9, 14, 9, 31)); - assertTrue(containsSymbol(allSymbols, "@+ 'namedParameterJdbcTemplate' NamedParameterJdbcTemplate", docUri, 13, 14, 13, 45)); - assertTrue(containsSymbol(allSymbols, "@+ 'persistenceExceptionTranslationPostProcessor' PersistenceExceptionTranslationPostProcessor", docUri, 19, 10, 19, 97)); + assertTrue(containsSymbol(allSymbols, "@+ 'transactionManager' DataSourceTransactionManager", docUri, 6, 14, 6, 37)); + assertTrue(containsSymbol(allSymbols, "@+ 'jdbcTemplate' JdbcTemplate", docUri, 8, 14, 8, 31)); + assertTrue(containsSymbol(allSymbols, "@+ 'namedParameterJdbcTemplate' NamedParameterJdbcTemplate", docUri, 12, 14, 12, 45)); + assertTrue(containsSymbol(allSymbols, "@+ 'persistenceExceptionTranslationPostProcessor' PersistenceExceptionTranslationPostProcessor", docUri, 18, 10, 18, 97)); } private boolean containsSymbol(List symbols, String name, String uri, int startLine, int startCHaracter, int endLine, int endCharacter) {