Skip to content

Commit

Permalink
[2020.3 compat] remove obsolete StatementParsing.FUTURE flag from s…
Browse files Browse the repository at this point in the history
…dkcompat

The flag is nonexistent in the sdk for 2020.3. The flag has been used previously for Python 2.6 support of `__future__` imports of `print_function` but [is obsolete](JetBrains/intellij-community@7ec52fb) since 2.6 support has been dropped [since 2019.1](https://github.com/JetBrains/intellij-community/blob/a251e6a423baa93fc6fd85038ec9ccec63fc2797/python/python-psi-api/src/com/jetbrains/python/psi/LanguageLevel.java)

For reasons of having a simple implementation of compatibility with old sdks and reducing the maintenance burden we chose to pass the StatementParsing.FUTURE as null for versions < 203.

PiperOrigin-RevId: 355938588
  • Loading branch information
AlexeyGy authored and copybara-github committed Feb 17, 2021
1 parent a43003d commit ce01209
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 27 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.google.idea.sdkcompat.python;

import com.intellij.lang.PsiBuilder;
import com.jetbrains.python.parsing.ParsingContext;
import com.jetbrains.python.psi.LanguageLevel;

/** Compatibility adapter for {@link ParsingContext}. #api202 */
public class ParsingContextAdapter extends ParsingContext {
/** #api202: Constructor does NOT accept the additional futureFlag parameter anymore in 2020.3 */
public ParsingContextAdapter(PsiBuilder builder, LanguageLevel languageLevel) {
// For reasons of having a simple implementation of compatibility with old sdks and reducing the
// maintenance burden we chose to pass the StatementParsing.FUTURE as null for versions < 203.
// we expect this to only impact python versions below 2.7.
// Python 2.67, the last version below 2.7, is officially unsupported
// and a potential security risk context: https://www.python.org/downloads/release/python-267/

super(builder, languageLevel, /* futureFlag= */ null);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@
import com.jetbrains.python.parsing.StatementParsing;
import com.jetbrains.python.psi.LanguageLevel;

/** Compatibility adapter for {@link PyParser}. #api201 */
/** Compatibility adapter for {@link PyParser}. #api202 */
public abstract class PyParserAdapter extends PyParser {

/** #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2 */
/**
* #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2
*
* <p>#api202: Super method does not require futureFlag anymore in 2020.3
*/
@Override
protected ParsingContext createParsingContext(
PsiBuilder builder, LanguageLevel languageLevel, StatementParsing.FUTURE futureFlag) {
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel, futureFlag);
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel);
}

protected abstract ParsingContext createParsingContext(
SyntaxTreeBuilderWrapper builder,
LanguageLevel languageLevel,
StatementParsing.FUTURE futureFlag);
SyntaxTreeBuilderWrapper builder, LanguageLevel languageLevel);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.google.idea.sdkcompat.python;

import com.intellij.lang.PsiBuilder;
import com.jetbrains.python.parsing.ParsingContext;
import com.jetbrains.python.psi.LanguageLevel;

/** Compatibility adapter for {@link ParsingContext}. #api202 */
public class ParsingContextAdapter extends ParsingContext {
/** #api202: Constructor does NOT accept the additional futureFlag parameter anymore in 2020.3 */
public ParsingContextAdapter(PsiBuilder builder, LanguageLevel languageLevel) {
// For reasons of having a simple implementation of compatibility with old sdks and reducing the
// maintenance burden we chose to pass the StatementParsing.FUTURE as null for versions < 203.
// we expect this to only impact python versions below 2.7.
// Python 2.67, the last version below 2.7, is officially unsupported
// and a potential security risk context: https://www.python.org/downloads/release/python-267/

super(builder, languageLevel, /* futureFlag= */ null);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@
/** Compatibility adapter for {@link PyParser}. #api201 */
public abstract class PyParserAdapter extends PyParser {

/** #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2 */
/**
* #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2
*
* <p>#api202: Super method does not require futureFlag anymore in 2020.3
*/
@Override
protected ParsingContext createParsingContext(
PsiBuilder builder, LanguageLevel languageLevel, StatementParsing.FUTURE futureFlag) {
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel, futureFlag);
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel);
}

protected abstract ParsingContext createParsingContext(
SyntaxTreeBuilderWrapper builder,
LanguageLevel languageLevel,
StatementParsing.FUTURE futureFlag);
SyntaxTreeBuilderWrapper builder, LanguageLevel languageLevel);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.google.idea.sdkcompat.python;

import com.intellij.lang.SyntaxTreeBuilder;
import com.jetbrains.python.parsing.ParsingContext;
import com.jetbrains.python.psi.LanguageLevel;

/** Compatibility adapter for {@link ParsingContext}. #api202 */
public class ParsingContextAdapter extends ParsingContext {
/** #api202: Constructor does NOT accept the additional futureFlag parameter anymore in 2020.3 */
public ParsingContextAdapter(SyntaxTreeBuilder builder, LanguageLevel languageLevel) {
// For reasons of having a simple implementation of compatibility with old sdks and reducing the
// maintenance burden we chose to pass the StatementParsing.FUTURE as null for versions < 203.
// we expect this to only impact python versions below 2.7.
// Python 2.67, the last version below 2.7, is officially unsupported
// and a potential security risk context: https://www.python.org/downloads/release/python-267/

super(builder, languageLevel, /* futureFlag= */ null);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@
import com.intellij.lang.SyntaxTreeBuilder;
import com.jetbrains.python.parsing.ParsingContext;
import com.jetbrains.python.parsing.PyParser;
import com.jetbrains.python.parsing.StatementParsing;
import com.jetbrains.python.parsing.StatementParsing.FUTURE;
import com.jetbrains.python.psi.LanguageLevel;

/** Compatibility adapter for {@link PyParser}. #api201 */
/** Compatibility adapter for {@link PyParser}. #api202 */
public abstract class PyParserAdapter extends PyParser {

/** #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2 */
/**
* #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2
*
* <p>#api202: Super method does not require futureFlag anymore in 2020.3
*/
@Override
protected ParsingContext createParsingContext(
SyntaxTreeBuilder builder, LanguageLevel languageLevel, StatementParsing.FUTURE futureFlag) {
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel, futureFlag);
SyntaxTreeBuilder builder, LanguageLevel languageLevel, FUTURE futureFlag) {
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel);
}

protected abstract ParsingContext createParsingContext(
SyntaxTreeBuilderWrapper builder,
LanguageLevel languageLevel,
StatementParsing.FUTURE futureFlag);
SyntaxTreeBuilderWrapper builder, LanguageLevel languageLevel);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.google.idea.sdkcompat.python;

import com.intellij.lang.SyntaxTreeBuilder;
import com.jetbrains.python.parsing.ParsingContext;
import com.jetbrains.python.psi.LanguageLevel;

/** Compatibility adapter for {@link ParsingContext}. #api202 */
public class ParsingContextAdapter extends ParsingContext {
/** #api202: Constructor does NOT accept the additional futureFlag parameter anymore in 2020.3 */
public ParsingContextAdapter(SyntaxTreeBuilder builder, LanguageLevel languageLevel) {
super(builder, languageLevel);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@
import com.intellij.lang.SyntaxTreeBuilder;
import com.jetbrains.python.parsing.ParsingContext;
import com.jetbrains.python.parsing.PyParser;
import com.jetbrains.python.parsing.StatementParsing;
import com.jetbrains.python.psi.LanguageLevel;

/** Compatibility adapter for {@link PyParser}. #api201 */
/** Compatibility adapter for {@link PyParser}. #api202 */
public abstract class PyParserAdapter extends PyParser {

/** #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2 */
/**
* #api201: Super method uses new interface SyntaxTreeBuilder in 2020.2
*
* <p>#api202: Super method does not require futureFlag anymore in 2020.3
*/
@Override
protected ParsingContext createParsingContext(
SyntaxTreeBuilder builder, LanguageLevel languageLevel, StatementParsing.FUTURE futureFlag) {
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel, futureFlag);
SyntaxTreeBuilder builder, LanguageLevel languageLevel) {
return createParsingContext(SyntaxTreeBuilderWrapper.wrap(builder), languageLevel);
}

protected abstract ParsingContext createParsingContext(
SyntaxTreeBuilderWrapper builder,
LanguageLevel languageLevel,
StatementParsing.FUTURE futureFlag);
SyntaxTreeBuilderWrapper builder, LanguageLevel languageLevel);
}

0 comments on commit ce01209

Please sign in to comment.