Skip to content

Commit 504af59

Browse files
sebthomsebthom
committed
refact: minor code cleanup
1 parent 91e10e9 commit 504af59

File tree

4 files changed

+32
-40
lines changed

4 files changed

+32
-40
lines changed

‎org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExp.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ public OnigRegExp(final String pattern, final boolean ignoreCase) {
8585

8686
private Regex parsePattern(final String pattern, final boolean ignoreCase) throws SyntaxException {
8787
int options = Option.CAPTURE_GROUP;
88-
if (ignoreCase)
88+
if (ignoreCase) {
8989
options |= Option.IGNORECASE;
90+
}
9091
final byte[] patternBytes = pattern.getBytes(StandardCharsets.UTF_8);
9192
return new Regex(patternBytes, 0, patternBytes.length, options, NonStrictUTF8Encoding.INSTANCE, Syntax.RUBY,
9293
LOGGER.isLoggable(Level.WARNING) ? LOGGER_WARN_CALLBACK : WarnCallback.NONE);
@@ -209,7 +210,6 @@ private boolean isFixedLength(final String body) {
209210
} catch (final NumberFormatException e) {
210211
return false;
211212
}
212-
int n = m;
213213
if (j < body.length() && body.charAt(j) == ',') {
214214
j++;
215215
int k = j;
@@ -219,12 +219,12 @@ private boolean isFixedLength(final String body) {
219219
if (k == j)
220220
return false; // {m,}
221221
try {
222-
n = Integer.parseInt(body.substring(j, k));
222+
final int n = Integer.parseInt(body.substring(j, k));
223+
if (m != n)
224+
return false; // {m,n} with m != n
223225
} catch (final NumberFormatException e) {
224226
return false;
225227
}
226-
if (m != n)
227-
return false; // {m,n} with m != n
228228
j = k;
229229
}
230230
final int close = body.indexOf('}', j);
@@ -240,18 +240,16 @@ private boolean isFixedLength(final String body) {
240240
* @return null if not found
241241
*/
242242
public @Nullable OnigResult search(final OnigString str, final int startPosition) {
243-
if (hasGAnchor) {
243+
if (hasGAnchor)
244244
// Should not use caching, because the regular expression
245245
// targets the current search position (\G)
246246
return search(str.bytesUTF8, startPosition, str.bytesCount);
247-
}
248247

249-
final var lastSearchResult0 = this.lastSearchResult;
248+
final var lastSearchResult0 = lastSearchResult;
250249
if (lastSearchString == str
251250
&& lastSearchPosition <= startPosition
252-
&& (lastSearchResult0 == null || lastSearchResult0.locationAt(0) >= startPosition)) {
251+
&& (lastSearchResult0 == null || lastSearchResult0.locationAt(0) >= startPosition))
253252
return lastSearchResult0;
254-
}
255253

256254
lastSearchString = str;
257255
lastSearchPosition = startPosition;

‎org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,25 @@ void testTokenizeConcurrent() throws Exception {
8585
final int numThreads = 4;
8686
final int numIterations = 10;
8787

88-
final var executor = Executors.newFixedThreadPool(numThreads);
89-
final Runnable tokenizationTask = () -> {
90-
for (int i = 0; i < numIterations; i++) {
91-
final var r = TokenizationUtils.tokenizeText(content, grammar);
92-
assertThat(r.count()).isGreaterThan(10);
93-
}
94-
};
88+
try (final var executor = Executors.newFixedThreadPool(numThreads)) {
89+
final Runnable tokenizationTask = () -> {
90+
for (int i = 0; i < numIterations; i++) {
91+
final var r = TokenizationUtils.tokenizeText(content, grammar);
92+
assertThat(r.count()).isGreaterThan(10);
93+
}
94+
};
9595

96-
final List<Future<?>> futures = new ArrayList<>();
97-
for (int i = 0; i < numThreads; i++) {
98-
futures.add(executor.submit(tokenizationTask));
99-
}
96+
final List<Future<?>> futures = new ArrayList<>();
97+
for (int i = 0; i < numThreads; i++) {
98+
futures.add(executor.submit(tokenizationTask));
99+
}
100100

101-
for (final Future<?> future : futures) {
102-
future.get();
101+
for (final Future<?> future : futures) {
102+
future.get();
103+
}
104+
executor.shutdown();
105+
executor.awaitTermination(1, TimeUnit.MINUTES);
103106
}
104-
105-
executor.shutdown();
106-
executor.awaitTermination(1, TimeUnit.MINUTES);
107107
}
108108

109109
@Test

‎org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/LanguageConfigurationCharacterPairMatcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class LanguageConfigurationCharacterPairMatcher
3232
implements ICharacterPairMatcher, ICharacterPairMatcherExtension {
3333

34-
private static DefaultCharacterPairMatcher NOOP_MATCHER = new DefaultCharacterPairMatcher(new char[0]);
34+
private static final DefaultCharacterPairMatcher NOOP_MATCHER = new DefaultCharacterPairMatcher(new char[0]);
3535

3636
private @Nullable DefaultCharacterPairMatcher matcher;
3737
private @Nullable IDocument document;

‎org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,8 @@ private void createContentTypeTreeViewer(final Composite composite) {
195195
data.horizontalSpan = 2;
196196
contentTypesViewer.getControl().setLayoutData(data);
197197

198-
contentTypesViewer.addSelectionChangedListener(event -> {
199-
contentTypeText.setText(event.getStructuredSelection().getFirstElement() instanceof IContentType ct ? ct.toString() : "");
200-
});
198+
contentTypesViewer.addSelectionChangedListener(event -> contentTypeText
199+
.setText(event.getStructuredSelection().getFirstElement() instanceof final IContentType ct ? ct.toString() : ""));
201200
}
202201

203202
private static final class ContentTypesLabelProvider extends LabelProvider {
@@ -260,39 +259,34 @@ private Text createText(final Composite parent, final String s) {
260259
infoWidget.refresh(null);
261260

262261
final String path = fileText.getText();
263-
if (path.isEmpty()) {
262+
if (path.isEmpty())
264263
return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID,
265264
SelectLanguageConfigurationWizardPage_fileError_noSelection);
266-
}
267265
IPath p = new Path(path);
268266
if (!p.isAbsolute()) {
269267
p = castNonNull(ResourcesPlugin.getWorkspace().getRoot().getFile(p).getLocation());
270268
}
271269
try (var file = new FileReader(p.toFile())) {
272270
final var configuration = LanguageConfiguration.load(file);
273-
if (configuration == null) {
271+
if (configuration == null)
274272
return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID,
275273
SelectLanguageConfigurationWizardPage_fileError_invalid);
276-
}
277274
infoWidget.refresh(configuration);
278275
} catch (final Exception e) {
279276
return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID,
280277
SelectLanguageConfigurationWizardPage_fileError_error + e.getLocalizedMessage());
281278
}
282279

283-
if (contentTypeText.getText().isEmpty()) {
280+
if (contentTypeText.getText().isEmpty())
284281
return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID,
285282
SelectLanguageConfigurationWizardPage_contentTypeError_noSelection);
286-
}
287283
final var contentType = ContentTypeHelper.getContentTypeById(contentTypeText.getText());
288-
if (contentType == null) {
284+
if (contentType == null)
289285
return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID,
290286
SelectLanguageConfigurationWizardPage_contentTypeError_invalid);
291-
}
292-
if (registryManager.getLanguageConfigurationFor(contentType) != null) {
287+
if (registryManager.getLanguageConfigurationFor(contentType) != null)
293288
return new Status(IStatus.WARNING, LanguageConfigurationPlugin.PLUGIN_ID,
294289
SelectLanguageConfigurationWizardPage_contentTypeWarning_duplicate);
295-
}
296290
return null;
297291
}
298292

0 commit comments

Comments
 (0)