forked from eclipse-corrosion/corrosion
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
eclipse-corrosion#79 - Prevent competion assist in comments
- Check to see if the cursor is in a Rust comment or not before returning snippet completions Signed-off-by: Lucas Bullen <[email protected]>
- Loading branch information
Lucas Bullen
committed
Jun 4, 2018
1 parent
f2af9a5
commit 6bca4db
Showing
5 changed files
with
114 additions
and
3 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
97 changes: 97 additions & 0 deletions
97
...se.corrosion.tests/src/org/eclipse/corrosion/tests/TestSnippetContentAssistProcessor.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,97 @@ | ||
| /********************************************************************* | ||
| * Copyright (c) 2018 Red Hat Inc. and others. | ||
| * | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Lucas Bullen (Red Hat Inc.) - Initial implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.corrosion.tests; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.eclipse.core.resources.IFile; | ||
| import org.eclipse.core.resources.IProject; | ||
| import org.eclipse.core.runtime.CoreException; | ||
| import org.eclipse.corrosion.snippet.SnippetContentAssistProcessor; | ||
| import org.eclipse.jface.text.ITextOperationTarget; | ||
| import org.eclipse.jface.text.ITextViewer; | ||
| import org.eclipse.jface.text.contentassist.ICompletionProposal; | ||
| import org.eclipse.lsp4e.operations.completion.LSCompletionProposal; | ||
| import org.eclipse.ui.IEditorPart; | ||
| import org.eclipse.ui.PlatformUI; | ||
| import org.eclipse.ui.ide.IDE; | ||
| import org.eclipse.ui.texteditor.ITextEditor; | ||
| import org.junit.Test; | ||
|
|
||
| @SuppressWarnings("restriction") | ||
| public class TestSnippetContentAssistProcessor extends AbstractCorrosionTest { | ||
|
|
||
| @Test | ||
| public void testCompletionsPresent() throws Exception { | ||
| validateCompletionProposals("println", new String[] { "println!(\"$1\", $0)" }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCompletionsLimited() throws Exception { | ||
| validateCompletionProposals("noExpectedCompletion", null); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSingleLineComment() throws Exception { | ||
| validateCompletionProposals("// println", null); | ||
| // With prefix | ||
| validateCompletionProposals("not a comment // println", null); | ||
| // With multiline | ||
| validateCompletionProposals("not a comment \n also not a comment // println", null); | ||
| // Comment on an above line | ||
| validateCompletionProposals("// a comment \n println", new String[] { "println!(\"$1\", $0)" }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMultiLineComment() throws Exception { | ||
| validateCompletionProposals("/* println", null); | ||
| // With prefix | ||
| validateCompletionProposals("not a comment /* println", null); | ||
| // With multiline | ||
| validateCompletionProposals("not a comment \n not a comment /* println", null); | ||
| // With mulitple opens | ||
| validateCompletionProposals("not a comment \n not a comment /* in /* /* println", null); | ||
| // Previous closure | ||
| validateCompletionProposals("/* in a comment */ not a comment /* println", null); | ||
| // Previous closue no open | ||
| validateCompletionProposals("/* in a comment */ println", new String[] { "println!(\"$1\", $0)" }); | ||
| // Previous closue new line | ||
| validateCompletionProposals("/* in a comment */ \n println", new String[] { "println!(\"$1\", $0)" }); | ||
|
|
||
| } | ||
|
|
||
| private void validateCompletionProposals(String text, String[] expectedProposalTexts) | ||
| throws IOException, CoreException { | ||
| IProject project = getProject("basic"); | ||
| IFile file = project.getFolder("src").getFile("main.rs"); | ||
| IEditorPart editor = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), file); | ||
| ((ITextEditor) editor).getDocumentProvider().getDocument(editor.getEditorInput()).set(text); | ||
|
|
||
| ICompletionProposal[] proposals = (new SnippetContentAssistProcessor()).computeCompletionProposals( | ||
| (ITextViewer) editor.getAdapter(ITextOperationTarget.class), text.length() - 1); | ||
| if (expectedProposalTexts == null) { | ||
| assertTrue(proposals == null || proposals.length == 0); | ||
| return; | ||
| } | ||
| assertNotNull(proposals); | ||
| for (int i = 0; i < proposals.length; i++) { | ||
| assertEquals(((LSCompletionProposal) proposals[i]).getItem().getTextEdit().getNewText(), | ||
| expectedProposalTexts[i]); | ||
| } | ||
| } | ||
|
|
||
| } |
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