diff --git a/json/json.iml b/json/json.iml index dac5731b3411..841b13ac6986 100644 --- a/json/json.iml +++ b/json/json.iml @@ -16,6 +16,5 @@ - \ No newline at end of file diff --git a/json/src/com/intellij/json/JsonScriptContentProvider.java b/json/src/com/intellij/json/JsonScriptContentProvider.java index 3425307fe8bf..ef5feba6f2fe 100644 --- a/json/src/com/intellij/json/JsonScriptContentProvider.java +++ b/json/src/com/intellij/json/JsonScriptContentProvider.java @@ -13,23 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.json;/* - * Copyright 2000-2015 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.intellij.json; -import com.intellij.javascript.JSScriptContentProvider; import com.intellij.lang.HtmlScriptContentProvider; import com.intellij.lexer.Lexer; import com.intellij.psi.tree.IElementType; @@ -57,7 +42,7 @@ public final class JsonScriptContentProvider implements HtmlScriptContentProvide /** * We do not have highlighting JSON lexer for embedded environment for now, so we reuse JScript */ - return new JSScriptContentProvider().getHighlightingLexer(); + return null; //new JSScriptContentProvider().getHighlightingLexer(); } private static final class JsonEmbedded extends ILazyParseableElementType {