MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jps] excludes module-info classes from instrumentation

Browse Source
This commit is contained in:
Roman Shevchenko
2016-12-12 17:15:12 +01:00
parent c2fd22f05a
commit 97b235937e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/classFilesIndex/indexer/api/ClassFilesIndicesBuilder.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ public class ClassFilesIndicesBuilder extends BaseInstrumentingBuilder {
@Override
protected boolean canInstrument(final CompiledClass compiledClass, final int classFileVersion) {
return true;
return !"module-info".equals(compiledClass.getClassName());
}
@Override
jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ public class NotNullInstrumentingBuilder extends BaseInstrumentingBuilder{
@Override
protected boolean canInstrument(CompiledClass compiledClass, int classFileVersion) {
return classFileVersion >= Opcodes.V1_5;
return classFileVersion >= Opcodes.V1_5 && !"module-info".equals(compiledClass.getClassName());
}
// todo: probably instrument other NotNull-like annotations defined in project settings?
plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/instrumentation/PatternValidatorBuilder.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ public class PatternValidatorBuilder extends BaseInstrumentingBuilder{
@Override
protected boolean canInstrument(CompiledClass compiledClass, int classFileVersion) {
return true;
return !"module-info".equals(compiledClass.getClassName());
}
@Nullable