typescript: improve tsconfig support

This commit is contained in:
Andrey Starovoyt
2016-10-06 20:44:42 +03:00
parent 600ae31dcf
commit 3ae314e35a
@@ -1,3 +1,18 @@
/*
* 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.
* 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 com.jetbrains.jsonSchema.impl;
import com.intellij.json.psi.*;
@@ -244,7 +259,8 @@ class JsonBySchemaObjectAnnotator implements Annotator {
}
private boolean checkForEnum(JsonValue value, JsonSchemaObject schema) {
if (schema.getEnum() == null) return true;
//enum values + pattern -> don't check enum values
if (schema.getEnum() == null || schema.getPattern() != null) return true;
final String text = value.getText();
final List<Object> objects = schema.getEnum();
for (Object object : objects) {