azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codebase update

Browse Source
This commit is contained in:
Yan Zhulanow
2015-02-03 18:37:49 +03:00
parent 346dbe3f7c
commit c756cfef86
46 changed files with 197 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/plugin-api/plugin-api.iml
+2 -2
View File
@@ -9,6 +9,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="intellij-core" level="project" />
<orderEntry type="library" name="kotlin-runtime" level="project" />
<orderEntry type="module" module-name="frontend" />
</component>
</module>
</module>
compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfiguration.java
-129
View File
@@ -1,129 +0,0 @@
/*
* Copyright 2010-2013 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.
* 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.jetbrains.jet.config;
import com.intellij.openapi.util.Key;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
@SuppressWarnings("unchecked")
public class CompilerConfiguration {
private final Map<Key, Object> map = new HashMap<Key, Object>();
private boolean readOnly = false;
@Nullable
public <T> T get(@NotNull CompilerConfigurationKey<T> key) {
T data = (T) map.get(key.ideaKey);
return data == null ? null : unmodifiable(data);
}
@NotNull
public <T> T get(@NotNull CompilerConfigurationKey<T> key, @NotNull T defaultValue) {
T data = (T) map.get(key.ideaKey);
return data == null ? defaultValue : unmodifiable(data);
}
@NotNull
public <T> List<T> getList(@NotNull CompilerConfigurationKey<List<T>> key) {
List<T> data = (List<T>) map.get(key.ideaKey);
if (data == null) {
return Collections.emptyList();
}
else {
return Collections.unmodifiableList(data);
}
}
public <T> void put(@NotNull CompilerConfigurationKey<T> key, @Nullable T value) {
checkReadOnly();
map.put(key.ideaKey, value);
}
public <T> void add(@NotNull CompilerConfigurationKey<List<T>> key, @NotNull T value) {
checkReadOnly();
Key<List<T>> ideaKey = key.ideaKey;
if (map.get(ideaKey) == null) {
map.put(ideaKey, new ArrayList<T>());
}
List<T> list = (List<T>) map.get(ideaKey);
list.add(value);
}
public <T> void addAll(@NotNull CompilerConfigurationKey<List<T>> key, @NotNull Collection<T> values) {
checkReadOnly();
checkForNullElements(values);
Key<List<T>> ideaKey = key.ideaKey;
if (map.get(ideaKey) == null) {
map.put(ideaKey, new ArrayList<T>());
}
List<T> list = (List<T>) map.get(ideaKey);
list.addAll(values);
}
public CompilerConfiguration copy() {
CompilerConfiguration copy = new CompilerConfiguration();
copy.map.putAll(map);
return copy;
}
private void checkReadOnly() {
if (readOnly) {
throw new IllegalStateException("CompilerConfiguration is read-only");
}
}
public void setReadOnly(boolean readOnly) {
if (readOnly != this.readOnly) {
checkReadOnly();
this.readOnly = readOnly;
}
}
@NotNull
private static <T> T unmodifiable(@NotNull T object) {
if (object instanceof List) {
return (T) Collections.unmodifiableList((List) object);
}
else if (object instanceof Map) {
return (T) Collections.unmodifiableMap((Map) object);
}
else if (object instanceof Collection) {
return (T) Collections.unmodifiableCollection((Collection) object);
}
else {
return object;
}
}
@Override
public String toString() {
return map.toString();
}
private static <T> void checkForNullElements(Collection<T> values) {
int index = 0;
for (T value : values) {
if (value == null) {
throw new IllegalArgumentException("Element " + index
+ " is null, while null values in compiler configuration are not allowed");
}
index++;
}
}
}
compiler/plugin-api/src/org/jetbrains/jet/config/CompilerConfigurationKey.java
-34
View File
@@ -1,34 +0,0 @@
/*
* Copyright 2010-2013 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.
* 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.jetbrains.jet.config;
import com.intellij.openapi.util.Key;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
public class CompilerConfigurationKey<T> {
Key<T> ideaKey;
private CompilerConfigurationKey(@NotNull @NonNls String name) {
ideaKey = Key.create(name);
}
@NotNull
public static <T> CompilerConfigurationKey<T> create(@NotNull @NonNls String name) {
return new CompilerConfigurationKey<T>(name);
}
}
compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.compiler.plugin
import org.jetbrains.jet.config.CompilerConfiguration
import org.jetbrains.kotlin.config.CompilerConfiguration
public trait CommandLineProcessor {
public val pluginId: String
compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt
+2 -2
View File
@@ -16,9 +16,9 @@
package org.jetbrains.kotlin.compiler.plugin
import org.jetbrains.jet.config.CompilerConfigurationKey
import org.jetbrains.jet.config.CompilerConfiguration
import com.intellij.mock.MockProject
import org.jetbrains.kotlin.config.CompilerConfigurationKey
import org.jetbrains.kotlin.config.CompilerConfiguration
public trait ComponentRegistrar {
class object {