A.T. Robertson Commentary Luke 22:18

"for I say unto you, I shall not drink from henceforth of the fruit of the vine, until the kingdom of God shall come." — Luke 22:18 (ASV)

The fruit of the vine (του γενηματος της αμπελου). So Mr 14:25; Matthew 26:29 and not οινος though it was wine undoubtedly. But the language allows anything that is "the fruit of the vine."

Come (ελθη). Second aorist active subjunctive with εως as in verse 16. Here it is the consummation of the kingdom that Jesus has in mind, for the kingdom had already come.