Fix test failures and unused variable warning

eclipse-jdt · Mar 7, 2024 · 26b6ed3 · 26b6ed3
1 parent 28c7598
commit 26b6ed3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/...ion/core extension/org/eclipse/jdt/internal/corext/fix/ConvertToMessageFormatFixCore.java b/...ion/core extension/org/eclipse/jdt/internal/corext/fix/ConvertToMessageFormatFixCore.java
@@ -112,7 +112,7 @@ public static ConvertToMessageFormatFixCore createConvertToMessageFormatFix(Comp
 				NLSLine nlsLine= scanCurrentLine(cu, operand);
 				if (nlsLine != null) {
 					for (NLSElement element : nlsLine.getElements()) {
-						if (element.getPosition().getOffset() == operand.getStartPosition()) {
+						if (element.getPosition().getOffset() == compilationUnit.getColumnNumber(operand.getStartPosition())) {
 							if (element.hasTag()) {
 								if (seenNoTag) {
 									return null;
@@ -142,10 +142,11 @@ public static ConvertToMessageFormatFixCore createConvertToMessageFormatFix(Comp
 	private static NLSLine scanCurrentLine(ICompilationUnit cu, Expression exp) {
 		CompilationUnit cUnit= (CompilationUnit)exp.getRoot();
 		int startLine= cUnit.getLineNumber(exp.getStartPosition());
+		int startLinePos= cUnit.getPosition(startLine, 0);
 		int endOfLine= cUnit.getPosition(startLine + 1, 0);
 		NLSLine[] lines;
 		try {
-			lines= NLSScanner.scan(cu.getBuffer().getText(exp.getStartPosition(), endOfLine - exp.getStartPosition()));
+			lines= NLSScanner.scan(cu.getBuffer().getText(startLinePos, endOfLine - startLinePos));
 			if (lines.length > 0) {
 				return lines[0];
 			}
@@ -205,7 +206,7 @@ public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore
 					NLSLine nlsLine= scanCurrentLine(cu, operand);
 					if (nlsLine != null) {
 						for (NLSElement element : nlsLine.getElements()) {
-							if (element.getPosition().getOffset() == operand.getStartPosition()) {
+							if (element.getPosition().getOffset() == root.getColumnNumber(operand.getStartPosition())) {
 								if (element.hasTag()) {
 									++tagsCount;
 								}

diff --git a/...tion/core extension/org/eclipse/jdt/internal/corext/fix/ConvertToStringBufferFixCore.java b/...tion/core extension/org/eclipse/jdt/internal/corext/fix/ConvertToStringBufferFixCore.java
@@ -260,12 +260,13 @@ public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore
 
 			Statement lastAppend= insertAfter;
 			int tagsCount= 0;
+			CompilationUnit compilationUnit= (CompilationUnit)oldInfixExpression.getRoot();
 			for (Expression operand : operands) {
 				boolean tagged= false;
 				NLSLine nlsLine= scanCurrentLine(cu, operand);
 				if (nlsLine != null) {
 					for (NLSElement element : nlsLine.getElements()) {
-						if (element.getPosition().getOffset() == operand.getStartPosition()) {
+						if (element.getPosition().getOffset() == compilationUnit.getColumnNumber(operand.getStartPosition())) {
 							if (element.hasTag()) {
 								tagged= true;
 								++tagsCount;
@@ -326,10 +327,11 @@ public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore
 		private static NLSLine scanCurrentLine(ICompilationUnit cu, Expression exp) {
 			CompilationUnit cUnit= (CompilationUnit)exp.getRoot();
 			int startLine= cUnit.getLineNumber(exp.getStartPosition());
+			int startLinePos= cUnit.getPosition(startLine, 0);
 			int endOfLine= cUnit.getPosition(startLine + 1, 0);
 			NLSLine[] lines;
 			try {
-				lines= NLSScanner.scan(cu.getBuffer().getText(exp.getStartPosition(), endOfLine - exp.getStartPosition()));
+				lines= NLSScanner.scan(cu.getBuffer().getText(startLinePos, endOfLine - startLinePos));
 				if (lines.length > 0) {
 					return lines[0];
 				}

diff --git a/...tion/core extension/org/eclipse/jdt/internal/corext/fix/ConvertToStringFormatFixCore.java b/...tion/core extension/org/eclipse/jdt/internal/corext/fix/ConvertToStringFormatFixCore.java
@@ -113,7 +113,7 @@ public static ConvertToStringFormatFixCore createConvertToStringFormatFix(Compil
 				NLSLine nlsLine= scanCurrentLine(cu, operand);
 				if (nlsLine != null) {
 					for (NLSElement element : nlsLine.getElements()) {
-						if (element.getPosition().getOffset() == operand.getStartPosition()) {
+						if (element.getPosition().getOffset() == compilationUnit.getColumnNumber(operand.getStartPosition())) {
 							if (element.hasTag()) {
 								if (seenNoTag) {
 									return null;
@@ -142,10 +142,11 @@ public static ConvertToStringFormatFixCore createConvertToStringFormatFix(Compil
 	private static NLSLine scanCurrentLine(ICompilationUnit cu, Expression exp) {
 		CompilationUnit cUnit= (CompilationUnit)exp.getRoot();
 		int startLine= cUnit.getLineNumber(exp.getStartPosition());
+		int startLinePos= cUnit.getPosition(startLine, 0);
 		int endOfLine= cUnit.getPosition(startLine + 1, 0);
 		NLSLine[] lines;
 		try {
-			lines= NLSScanner.scan(cu.getBuffer().getText(exp.getStartPosition(), endOfLine - exp.getStartPosition()));
+			lines= NLSScanner.scan(cu.getBuffer().getText(startLinePos, endOfLine - startLinePos));
 			if (lines.length > 0) {
 				return lines[0];
 			}
@@ -197,7 +198,7 @@ public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore
 					NLSLine nlsLine= scanCurrentLine(cu, operand);
 					if (nlsLine != null) {
 						for (NLSElement element : nlsLine.getElements()) {
-							if (element.getPosition().getOffset() == operand.getStartPosition()) {
+							if (element.getPosition().getOffset() == root.getColumnNumber(operand.getStartPosition())) {
 								if (element.hasTag()) {
 									++tagsCount;
 								}

diff --git a/...on/core extension/org/eclipse/jdt/internal/corext/fix/StringConcatToTextBlockFixCore.java b/...on/core extension/org/eclipse/jdt/internal/corext/fix/StringConcatToTextBlockFixCore.java
@@ -205,7 +205,7 @@ private boolean hasNLS(List<Comment> trailingComments, ICompilationUnit cu) {
 				try {
 					buffer= cu.getBuffer();
 					for (Comment comment : trailingComments) {
-						if (comment instanceof LineComment lineComment) {
+						if (comment instanceof LineComment) {
 							if (buffer.getText(comment.getStartPosition(), comment.getLength()).contains("$NON-NLS")) { //$NON-NLS-1$
 								return true;
 							}