From 5632b9b76777c628c28378bfc807c40554147d2a Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Wed, 19 Oct 2022 10:44:24 -0500
Subject: [PATCH 1/2] git subrepo clone --branch=fix_lineno_range --force
 https://github.com/impact27/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "37ff0dc40"
upstream:
  origin:   "https://github.com/impact27/spyder-kernels.git"
  branch:   "fix_lineno_range"
  commit:   "37ff0dc40"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
---
 external-deps/spyder-kernels/.gitrepo                    | 6 +++---
 .../spyder-kernels/spyder_kernels/customize/utils.py     | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo
index 20c47a0b733..0c11b982d42 100644
--- a/external-deps/spyder-kernels/.gitrepo
+++ b/external-deps/spyder-kernels/.gitrepo
@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/spyder-ide/spyder-kernels.git
-	branch = 2.x
-	commit = 26c5e2303ad527697bb407cd0d54bad4357b3821
-	parent = 6c121ac659d90d73da58f926510074163a1ada88
+	branch = fix_lineno_range
+	commit = 37ff0dc40135ddf959703f6ffbd57945789996eb
+	parent = 0fb9f0b6f412bb5d681cdb96dcf1055640a74bd9
 	method = merge
 	cmdver = 0.4.3
diff --git a/external-deps/spyder-kernels/spyder_kernels/customize/utils.py b/external-deps/spyder-kernels/spyder_kernels/customize/utils.py
index e87b302e2ab..f34a0e5a770 100644
--- a/external-deps/spyder-kernels/spyder_kernels/customize/utils.py
+++ b/external-deps/spyder-kernels/spyder_kernels/customize/utils.py
@@ -8,6 +8,7 @@
 import ast
 import os
 import re
+import sys
 import sysconfig
 
 
@@ -113,6 +114,14 @@ def capture_last_Expr(code_ast, out_varname):
         # Fix line number and column offset
         assign_node.lineno = expr_node.lineno
         assign_node.col_offset = expr_node.col_offset
+        if sys.version_info[:2] >= (3, 8):
+            # Exists from 3.8, necessary from 3.11
+            assign_node.end_lineno = expr_node.end_lineno
+            if assign_node.lineno == assign_node.end_lineno:
+                # Add 'globals()[{}] = ' and remove 'None'
+                assign_node.end_col_offset += expr_node.end_col_offset - 4
+            else:
+                assign_node.end_col_offset = expr_node.end_col_offset
         code_ast.body[-1] = assign_node
     return code_ast, capture_last_expression
 

From c7a28f5211da947b4abd185814e5c885bdb75df2 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Wed, 19 Oct 2022 21:07:13 -0500
Subject: [PATCH 2/2] git subrepo clone (merge) --branch=2.x --force
 https://github.com/spyder-ide/spyder-kernels.git external-deps/spyder-kernels

subrepo:
  subdir:   "external-deps/spyder-kernels"
  merged:   "18acdb20b"
upstream:
  origin:   "https://github.com/spyder-ide/spyder-kernels.git"
  branch:   "2.x"
  commit:   "18acdb20b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

[ci skip]
---
 external-deps/spyder-kernels/.gitrepo | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/external-deps/spyder-kernels/.gitrepo b/external-deps/spyder-kernels/.gitrepo
index 0c11b982d42..e1382e6b344 100644
--- a/external-deps/spyder-kernels/.gitrepo
+++ b/external-deps/spyder-kernels/.gitrepo
@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://github.com/spyder-ide/spyder-kernels.git
-	branch = fix_lineno_range
-	commit = 37ff0dc40135ddf959703f6ffbd57945789996eb
-	parent = 0fb9f0b6f412bb5d681cdb96dcf1055640a74bd9
+	branch = 2.x
+	commit = 18acdb20b4e9db42db558a8fea773764dee81524
+	parent = 5632b9b76777c628c28378bfc807c40554147d2a
 	method = merge
 	cmdver = 0.4.3