MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixing platform code according to OuterElement changes

Browse Source 
GitOrigin-RevId: 67dbdffaad4913acb941bc58ebee055a13ec0d7e
This commit is contained in:
Alexandr Evstigneev
2020-08-14 15:59:37 +03:00
committed by intellij-monorepo-bot
parent 607d9ae0d2
commit f813c00b44
3 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/markdown/src/org/intellij/plugins/markdown/lang/MarkdownElementTypes.java
View File

@@ -1,24 +1,11 @@
/*
* 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.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.plugins.markdown.lang;
import com.intellij.psi.templateLanguages.TemplateDataElementType;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.IFileElementType;
import com.intellij.psi.tree.IStubFileElementType;
import com.intellij.psi.tree.OuterLanguageElementType;
import org.intellij.markdown.flavours.gfm.GFMElementTypes;
import org.intellij.markdown.flavours.gfm.GFMTokenTypes;
@@ -64,7 +51,7 @@ public interface MarkdownElementTypes {
IElementType HTML_BLOCK = platformType(org.intellij.markdown.MarkdownElementTypes.HTML_BLOCK);
IElementType MARKDOWN_OUTER_BLOCK = new IElementType("MARKDOWN_OUTER_BLOCK", MarkdownLanguage.INSTANCE);
IElementType MARKDOWN_OUTER_BLOCK = new OuterLanguageElementType("MARKDOWN_OUTER_BLOCK", MarkdownLanguage.INSTANCE);
TemplateDataElementType MARKDOWN_TEMPLATE_DATA =
new TemplateDataElementType("MARKDOWN_TEMPLATE_DATA", MarkdownLanguage.INSTANCE, HTML_BLOCK_CONTENT, MARKDOWN_OUTER_BLOCK);

5
python/python-rest/src/com/jetbrains/rest/RestPythonTemplateType.java
View File

@@ -1,9 +1,10 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.rest;
import com.intellij.lexer.Lexer;
import com.intellij.psi.templateLanguages.TemplateDataElementType;
import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider;
import com.intellij.psi.tree.IElementType;
import com.jetbrains.python.lexer.PythonHighlightingLexer;
import com.jetbrains.python.psi.LanguageLevel;
@@ -12,7 +13,7 @@ import com.jetbrains.python.psi.LanguageLevel;
*/
public class RestPythonTemplateType extends TemplateDataElementType {
public RestPythonTemplateType(String python_block_data, RestLanguage instance, RestElementType line, RestElementType restInjection) {
public RestPythonTemplateType(String python_block_data, RestLanguage instance, RestElementType line, IElementType restInjection) {
super(python_block_data, instance, line, restInjection);
}

23
python/rest/src/com/jetbrains/rest/RestTokenTypes.java
View File

@@ -1,20 +1,9 @@
/*
* Copyright 2000-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.
*/
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.rest;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.OuterLanguageElementType;
/**
* User : catherine
*/
@@ -49,8 +38,8 @@ public interface RestTokenTypes {
RestElementType ERROR = new RestElementType("ERROR");
RestElementType REST_INJECTION = new RestElementType("REST_INJECTION");
RestElementType REST_DJANGO_INJECTION = new RestElementType("REST_DJANGO_INJECTION");
IElementType REST_INJECTION = new OuterLanguageElementType("REST_INJECTION", RestLanguage.INSTANCE);
IElementType REST_DJANGO_INJECTION = new OuterLanguageElementType("REST_DJANGO_INJECTION", RestLanguage.INSTANCE);
RestElementType DJANGO_LINE = new RestElementType("DJANGO_LINE");
RestElementType PYTHON_LINE = new RestElementType("PYTHON_LINE");
RestElementType JAVASCRIPT_LINE = new RestElementType("JAVASCRIPT_LINE");