generated from redhat-developer/new-project-template
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Formatting fails when position end is out of range of the document
Fixes #183 Signed-off-by: azerr <[email protected]>
- Loading branch information
1 parent
1578cac
commit dbef326
Showing
9 changed files
with
342 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
src/test/java/com/redhat/devtools/lsp4ij/LSPIJUtils_toOffsetTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Red Hat, Inc. | ||
| * Distributed under license by Red Hat, Inc. All rights reserved. | ||
| * This program is made available under the terms of the | ||
| * Eclipse Public License v2.0 which accompanies this distribution, | ||
| * and is available at http://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * Contributors: | ||
| * Red Hat, Inc. - initial API and implementation | ||
| ******************************************************************************/ | ||
| package com.redhat.devtools.lsp4ij; | ||
|
|
||
| import com.intellij.openapi.editor.Document; | ||
| import com.intellij.openapi.editor.impl.DocumentImpl; | ||
| import com.intellij.testFramework.fixtures.BasePlatformTestCase; | ||
| import org.eclipse.lsp4j.Position; | ||
|
|
||
| /** | ||
| * Tests for {@link LSPIJUtils#toOffset(Position, Document)}. | ||
| */ | ||
| public class LSPIJUtils_toOffsetTest extends BasePlatformTestCase { | ||
|
|
||
| public void testValidPositionWithOneLine() { | ||
| assertOffset("foo", 0, 0, 0, 'f'); | ||
| assertOffset("foo", 0, 1, 1, 'o'); | ||
| assertOffset("foo", 0, 2, 2, 'o'); | ||
| assertOffset("foo", 0, 3, 3, null); | ||
| } | ||
|
|
||
| public void testValidPositionWithTwoLines() { | ||
| assertOffset("foo\nbar", 0, 0, 0, 'f'); | ||
| assertOffset("foo\nbar", 0, 1, 1, 'o'); | ||
| assertOffset("foo\nbar", 0, 2, 2, 'o'); | ||
| assertOffset("foo\nbar", 0, 3, 3, null); | ||
|
|
||
| assertOffset("foo\nbar", 1, 0, 4, 'b'); | ||
| assertOffset("foo\nbar", 1, 1, 5, 'a'); | ||
| assertOffset("foo\nbar", 1, 2, 6, 'r'); | ||
| assertOffset("foo\nbar", 1, 3, 7, null); | ||
| } | ||
|
|
||
| public void testInvalidLineWithOneLine() { | ||
| assertOffset("foo", 999999, 0, 0, 'f'); | ||
| assertOffset("foo", 999999, 1, 1, 'o'); | ||
| assertOffset("foo", 999999, 2, 2, 'o'); | ||
| assertOffset("foo", 999999, 3, 3, null); | ||
| } | ||
|
|
||
| public void testInvalidLineWithTwoLines() { | ||
| assertOffset("foo\nbar", 999999, 0, 4, 'b'); | ||
| assertOffset("foo\nbar", 999999, 1, 5, 'a'); | ||
| assertOffset("foo\nbar", 999999, 2, 6, 'r'); | ||
| assertOffset("foo\nbar", 999999, 3, 7, null); | ||
| } | ||
|
|
||
| public void testInvalidCharacterWithOneLine() { | ||
| assertOffset("foo", 0, 999999, 3, null); | ||
| } | ||
|
|
||
| public void testInvalidCharacterWithTwoLines() { | ||
| assertOffset("foo\nbar", 0, 999999, 3, null); | ||
| assertOffset("foo\nbar", 1, 999999, 7, null); | ||
| } | ||
|
|
||
| public void testInvalidPositionWithOneLine() { | ||
| assertOffset("foo", 999999, 999999, 3, null); | ||
| } | ||
|
|
||
| public void testInvalidPositionWithTwoLine() { | ||
| assertOffset("foo\nbar", 999999, 999999, 7, null); | ||
| } | ||
|
|
||
| public void assertOffset(String content, int line, int character, int expectedOffset, Character expectedChar) { | ||
| assertOffset(content, new Position(line, character), expectedOffset, expectedChar); | ||
| } | ||
|
|
||
| public void assertOffset(String content, Position position, int expectedOffset, Character expectedChar) { | ||
| Document document = new DocumentImpl(content); | ||
| int actualOffset = LSPIJUtils.toOffset(position, document); | ||
| assertEquals(expectedOffset, actualOffset); | ||
| if (expectedChar == null) { | ||
| assertTrue(expectedOffset == content.length() /* offset is at the end of the file */ | ||
| || content.charAt(expectedOffset) == '\n' /* or offset is at the end of line */); | ||
| } else { | ||
| // get the character from the given offset | ||
| Character actualChar = document.getCharsSequence().charAt(expectedOffset); | ||
| assertEquals(expectedChar, actualChar); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
src/test/java/com/redhat/devtools/lsp4ij/features/formatting/ClojureFormattingTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Red Hat, Inc. | ||
| * Distributed under license by Red Hat, Inc. All rights reserved. | ||
| * This program is made available under the terms of the | ||
| * Eclipse Public License v2.0 which accompanies this distribution, | ||
| * and is available at http://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * Contributors: | ||
| * Red Hat, Inc. - initial API and implementation | ||
| ******************************************************************************/ | ||
| package com.redhat.devtools.lsp4ij.features.formatting; | ||
|
|
||
| import com.redhat.devtools.lsp4ij.fixtures.LSPFormattingFixtureTestCase; | ||
|
|
||
| /** | ||
| * Formatting tests by emulating LSP 'textDocument/formatting', 'textDocument/rangeFormatting' | ||
| * responses from the clojure-lsp language server. | ||
| */ | ||
| public class ClojureFormattingTest extends LSPFormattingFixtureTestCase { | ||
|
|
||
| public void testFormatting() { | ||
| // Test with TextEdit end which is outside the document length (uses of 999999) | ||
| assertFormatting("test.ts", | ||
| """ | ||
| (let | ||
| [binding ""])""", | ||
| """ | ||
| [ | ||
| { | ||
| "range": { | ||
| "start": { | ||
| "line": 0, | ||
| "character": 0 | ||
| }, | ||
| "end": { | ||
| "line": 999999, | ||
| "character": 999999 | ||
| } | ||
| }, | ||
| "newText": "(let\\n [binding \\"\\"])" | ||
| } | ||
| ] | ||
| """, | ||
| """ | ||
| (let | ||
| [binding ""])"""); | ||
| } | ||
| } |
Oops, something went wrong.