A method of expanding a command line comprising at least one command word and word separators delineating the at least one command word is presented. A trigger to expand the command line is detected, and upon detection of the trigger, a current cursor position within the command line is determined. From the current cursor position, a particular command word that is currently being edited is determined. The last characters of a particular command word is deleted from the cursor position onwards, thereby yielding a particular truncated command word. A match for the particular truncated command word is found in a command word database, and the particular truncated command is completed according to the match.