Skip to content

Commit

Permalink
formatter: fix missing space before instanceof
Browse files Browse the repository at this point in the history
  • Loading branch information
joshtynjala committed Dec 9, 2024
1 parent bf297e5 commit 975a04b
Show file tree
Hide file tree
Showing 2 changed files with 158 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ private String parseTokens(List<IASToken> tokens, String fileText, String filePa
}
case ASTokenTypes.TOKEN_KEYWORD_AS:
case ASTokenTypes.TOKEN_KEYWORD_IS:
case ASTokenTypes.TOKEN_KEYWORD_INSTANCEOF:
case ASTokenTypes.TOKEN_RESERVED_WORD_EACH:
case ASTokenTypes.TOKEN_RESERVED_WORD_EXTENDS:
case ASTokenTypes.TOKEN_RESERVED_WORD_IMPLEMENTS:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
////////////////////////////////////////////////////////////////////////////////
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright ownership.
// The ASF licenses this file to You under the Apache License, Version 2.0
// (the "License"); you may not use this file except in compliance with
// the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////

package org.apache.royale.formatter;

import static org.junit.Assert.assertEquals;

import org.junit.Test;

public class TestTypeOperators extends BaseFormatterTests {
@Test
public void testInstanceofOperator() {
FormatterSettings settings = new FormatterSettings();
settings.insertSpaceBeforeAndAfterBinaryOperators = true;
settings.placeOpenBraceOnNewLine = true;
settings.insertSpaces = false;
ASTokenFormatter formatter = new ASTokenFormatter(settings);
String result = formatter.format("file.as",
// @formatter:off
"a instanceof b;",
// @formatter:on
problems
);
assertEquals(
// @formatter:off
"a instanceof b;",
// @formatter:on
result);
}
@Test
public void testInstanceofOperatorInParentheses() {
FormatterSettings settings = new FormatterSettings();
settings.insertSpaceBeforeAndAfterBinaryOperators = true;
settings.placeOpenBraceOnNewLine = true;
settings.insertSpaces = false;
ASTokenFormatter formatter = new ASTokenFormatter(settings);
String result = formatter.format("file.as",
// @formatter:off
"if (a instanceof b)\n" +
"{\n" +
"\tstatement;\n" +
"}",
// @formatter:on
problems
);
assertEquals(
// @formatter:off
"if (a instanceof b)\n" +
"{\n" +
"\tstatement;\n" +
"}",
// @formatter:on
result);
}

@Test
public void testIsOperator() {
FormatterSettings settings = new FormatterSettings();
settings.insertSpaceBeforeAndAfterBinaryOperators = true;
settings.placeOpenBraceOnNewLine = true;
settings.insertSpaces = false;
ASTokenFormatter formatter = new ASTokenFormatter(settings);
String result = formatter.format("file.as",
// @formatter:off
"a is b;",
// @formatter:on
problems
);
assertEquals(
// @formatter:off
"a is b;",
// @formatter:on
result);
}

@Test
public void testIsOperatorInIf() {
FormatterSettings settings = new FormatterSettings();
settings.insertSpaceBeforeAndAfterBinaryOperators = true;
settings.placeOpenBraceOnNewLine = true;
settings.insertSpaces = false;
ASTokenFormatter formatter = new ASTokenFormatter(settings);
String result = formatter.format("file.as",
// @formatter:off
"if (a is b)\n" +
"{\n" +
"\tstatement;\n" +
"}",
// @formatter:on
problems
);
assertEquals(
// @formatter:off
"if (a is b)\n" +
"{\n" +
"\tstatement;\n" +
"}",
// @formatter:on
result);
}

@Test
public void testAsOperator() {
FormatterSettings settings = new FormatterSettings();
settings.insertSpaceBeforeAndAfterBinaryOperators = true;
settings.placeOpenBraceOnNewLine = true;
settings.insertSpaces = false;
ASTokenFormatter formatter = new ASTokenFormatter(settings);
String result = formatter.format("file.as",
// @formatter:off
"a as b;",
// @formatter:on
problems
);
assertEquals(
// @formatter:off
"a as b;",
// @formatter:on
result);
}

@Test
public void testAsOperatorInAssignment() {
FormatterSettings settings = new FormatterSettings();
settings.insertSpaceBeforeAndAfterBinaryOperators = true;
settings.placeOpenBraceOnNewLine = true;
settings.insertSpaces = false;
ASTokenFormatter formatter = new ASTokenFormatter(settings);
String result = formatter.format("file.as",
// @formatter:off
"var c = a as b;",
// @formatter:on
problems
);
assertEquals(
// @formatter:off
"var c = a as b;",
// @formatter:on
result);
}
}

0 comments on commit 975a04b

Please sign in to comment.